From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 5B4E13857C72 for ; Mon, 8 Jan 2024 22:07:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5B4E13857C72 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5B4E13857C72 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704751637; cv=none; b=D18Tuv97tcVlRk7WVA3a7hGHjIfH4nJ3KXaobKc0Vzg+YAEokJyApolZV0n2heNkmmcETX+NP/9xqo0BPUWNU2/7lSf02GnaJV8EfwYlx2Tsd3y7hRvMbNOAkFlTpHwJfG2kuNuxEgAFatS5x5FE+c2W1PZcMvF1jlSHlHStyOY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704751637; c=relaxed/simple; bh=MT653kr2pp3AQ4Y5V2Os+sRRhast7o5TuOKPXxcaPc4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=ni6+yJ+oRQ8MWQP3gzsDUiwPQgTWbmdEUIY1rtLk75P9Lyp74FXUC0iyGddmGdwalz2JkWfYTgAGpSzeL72GklADjYkFq0Gt5qKVAOqrNESU8S4wjqddGS9xrbGYMHqeeQ/LEqzxe/nRGyhBuKfVpTaT/sdbUfAyrKjZlwJ0Pa8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from csb.redhat.com (deer0x03.wildebeest.org [172.31.17.133]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 2A13F302BB42; Mon, 8 Jan 2024 23:07:14 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id 07440CB98D; Mon, 8 Jan 2024 23:07:14 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: sam@gentoo.org, arsen@aarsen.me, Mark Wielaard Subject: [PATCH] Tweak autoregen.py to handle sub/sub/dir AC_CONFIG_MACRO_DIRS Date: Mon, 8 Jan 2024 23:06:56 +0100 Message-Id: <20240108220656.1065494-1-mark@klomp.org> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is really a hack just for binutils-gdb/gprofng/libcollector. Make sure that the order of includes is done as --enable-maintainer-mode. Also add more symlinks for aclocal-1.15 and automake-1.15. --- builder/containers/Containerfile-autotools | 2 ++ builder/containers/autoregen.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/builder/containers/Containerfile-autotools b/builder/containers/Containerfile-autotools index 1099986..00401ad 100644 --- a/builder/containers/Containerfile-autotools +++ b/builder/containers/Containerfile-autotools @@ -30,10 +30,12 @@ RUN wget https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz && \ # Make sure we also have unversioned binaries so the system versions # aren't used RUN cd /usr/local/bin && \ + ln -s aclocal-1.15 aclocal && \ ln -s aclocal-1.15.1 aclocal && \ ln -s autoconf-2.69 autoconf && \ ln -s autoheader-2.69 autoheader && \ ln -s autom4te-2.69 autom4te && \ + ln -s automake-1.15 automake && \ ln -s automake-1.15.1 automake && \ ln -s autoreconf-2.69 autoreconf && \ ln -s autoscan-2.69 autoscan && \ diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py index bd200be..bfb8f3d 100755 --- a/builder/containers/autoregen.py +++ b/builder/containers/autoregen.py @@ -29,9 +29,15 @@ for folder in sorted(config_folders): if any(True for line in configure_lines if line.startswith('AC_CONFIG_MACRO_DIRS')): # aclocal does not support the -f short option for force include_arg = '' + include_arg2 = '' if (folder / '..' / 'config').is_dir(): include_arg = '-I../config' - subprocess.check_output(f'{ENV} {ACLOCAL_BIN} --force {include_arg}', shell=True, encoding='utf8') + # this is really a hack just for binutils-gdb/gprofng/libcollector + # make sure that the order of includes is done as --enable-maintainer-mode + if (folder / '..' / '..' / 'config').is_dir(): + include_arg = '-I../..' + include_arg2 = '-I../../config' + subprocess.check_output(f'{ENV} {ACLOCAL_BIN} --force {include_arg} {include_arg2}', shell=True, encoding='utf8') if ((folder / 'config.in').is_file() or any(True for line in configure_lines if line.startswith('AC_CONFIG_HEADERS'))): subprocess.check_output(f'{ENV} {AUTOHEADER_BIN} -f', shell=True, encoding='utf8') -- 2.39.3