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 CCD693858C41 for ; Thu, 16 Nov 2023 21:36:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CCD693858C41 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 CCD693858C41 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=1700170599; cv=none; b=J3GT/K60Mg3dnX3s7SmW2NLCavcz3UrhrbtlU0bOA9GZNaywmmVBcZfohPfovKOiuBol4TrI1I1uKYR4pKs7fjthlxbXGmsT7J0cIsZv3ra7WalmOdvVUBdDy4KTlZfyCs3yI4CdprjtR/YyXLvIassnvKUP3tn1LRQV4UQeJ1Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700170599; c=relaxed/simple; bh=N9MIIaW0zYicXtoJeqYrjOVOUxtFVh9sGwyHf7ngdNQ=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=G58hKoQsZfbn+4lurGFN2dJPTNu/VCs2MUsizPTQopzcJ3hKU5GA8npxKye/IX6Bosadwiiw3Qiky4gOqwvlZfq+PpdtitHAtBd8mJJsjd2ridEguHvLoBMZgEjLCgImkj+N8bS8wbkVeSieMuS2fVHDBtCfhHuovobVFW5pwS4= 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 0C23D302FDCD; Thu, 16 Nov 2023 22:36:36 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id A192214CC38; Thu, 16 Nov 2023 22:36:35 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] autoregen.py: Also run autoheader if there is a config.in file Date: Thu, 16 Nov 2023 22:36:21 +0100 Message-Id: <20231116213621.1991189-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=-3034.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,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: --- builder/containers/autoregen.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py index 3da6d67..bd200be 100755 --- a/builder/containers/autoregen.py +++ b/builder/containers/autoregen.py @@ -32,7 +32,8 @@ for folder in sorted(config_folders): 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')): + 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') # apparently automake is somehow unstable -> skip it for gotools if (any(True for line in configure_lines if line.startswith('AM_INIT_AUTOMAKE')) -- 2.39.3