From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id DB7043858D32 for ; Wed, 15 Nov 2023 15:17:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB7043858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DB7043858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700061456; cv=none; b=M3LKWWluX7Zw/GsLgDK1OYwyhiHY/q3exGBNgLR92Nyp4B7tcbTiba0pKg2lmJ7lRjVcm0I8ynZASpnIWYKtGxiZaTjT/OmUUPgIeMvagD9EEhXVCcThZy2H2yua0FNSumLYpPQ2d4wp8pSOLEd7ogol+EibxST15HvIt98/AHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700061456; c=relaxed/simple; bh=6E6uxG03Rza/BpZ1VJPONkmKQlzv5yOcPH7xP9k41v0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=S3OKvKOR55yqeolqEhxHidAUtJXG04x55eoKAg+MYzMByqz35ld9mw5k24AvHjYV5r8kpt5Z+oUrV3S5i4CQziPTruvV6e0FRRwXESqjkNGl7vSmYfPptoRuBPrbQPd+qEshGEFEInDeEkQKNKBo2J9gOrh8b4kriT36b+ZrcDg= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: buildbot@sourceware.org Cc: Sam James Subject: [PATCH v2] autoregen.py: handle aclocal Date: Wed, 15 Nov 2023 15:17:04 +0000 Message-ID: <20231115151721.2554589-1-sam@gentoo.org> X-Mailer: git-send-email 2.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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: We need to run aclocal which came up earlier with the binutils intl/ drop (syncing with gcc). The autotools docs recommend not running it manually but the setup we have is unconventional. --- Check for where we are and force an include path if needed. Also, pass --force. builder/containers/autoregen.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py index 9315334..3da6d67 100755 --- a/builder/containers/autoregen.py +++ b/builder/containers/autoregen.py @@ -26,6 +26,12 @@ for folder in sorted(config_folders): continue; os.chdir(folder) configure_lines = open('configure.ac').read().splitlines() + 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 = '' + if (folder / '..' / 'config').is_dir(): + include_arg = '-I../config' + subprocess.check_output(f'{ENV} {ACLOCAL_BIN} --force {include_arg}', shell=True, encoding='utf8') if 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') # apparently automake is somehow unstable -> skip it for gotools -- 2.42.1