From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 67E423858D20 for ; Wed, 15 Nov 2023 14:13:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 67E423858D20 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 67E423858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700057581; cv=none; b=bKlgH5hQgHpMFI3LW2emNezVqKBKzLe0/fh4jNTGQw6Wbv0ndSWLb9Xx5A0/e4CJhhdxbgPgfsMobyTBCjrOSQg3QTOoOU6RLGN2znLQEiz5ca1GKVBc/NdQUERJbkET2ddOlaAoilBm265ekM6MRqCG1dcbxJhySlJLPeQLRN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700057581; c=relaxed/simple; bh=Ow0bKnSgayU3XSHF/MmibASm7quaSdzB+qPHIj2ARPQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=gzQjHPmZvgRjgoRRIhiPKxoLpfHYCesy0WQjy2Y/+ULB4csx+vzp2bFORBbqXKkLom9Mgi8V5wbvxM3H9HKgFfCzuf9bKNls1SohWmooeWdTD45iWumCyqaT7FuCbS9C3OcqbfFO5BJenEQj+pZKTKsTfEW5gQX0q4bOva+HNjg= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: buildbot@sourceware.org Cc: Sam James Subject: [PATCH] autoregen.py: handle aclocal Date: Wed, 15 Nov 2023 14:12:52 +0000 Message-ID: <20231115141253.1041790-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,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. --- builder/containers/autoregen.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py index 9315334..8443551 100755 --- a/builder/containers/autoregen.py +++ b/builder/containers/autoregen.py @@ -26,6 +26,8 @@ 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')): + subprocess.check_output(f'{ENV} {ACLOCAL_BIN}', 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