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 CD40D3858C62; Mon, 8 Jan 2024 21:51:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD40D3858C62 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 CD40D3858C62 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=1704750709; cv=none; b=COdQ5o7g7ae3vXmXYGtWsYZNosRYPkga6RbJStfsBsdOltMDcHZGs0xtqD+ksMND9gDv1DiuHcGFu4GAg12y7ShCR0oDW0wEoRmOeRBKoC4T7pyX4ThKDfG16pF9CFwk7IwTNVRdqS6rGB1t30D1pL3HafSRsaBfgvlZjEV7kM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704750709; c=relaxed/simple; bh=hagGceFL3o6TMT7iSpvaS5YTawFBH6gzwz4mY23E+Zs=; h=Date:From:To:Subject:Message-ID:MIME-Version; b=g9rk6U6VgzihjT6Aj00jdlGvMxSAkVcQy4RZS2VL/w4MJJGr4iIXud/urvYzBmenuaHz/iIMMlFhTpPMEbPVavOtglL7Pasz1V/L0Ky2EaYUWJtqILGKy0+uMvhQED3OPlTX7otTmY/cF3AybI9LfCF2GZAxiRIyMypmDa3ZH3s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by gnu.wildebeest.org (Postfix, from userid 1000) id D9278302BB42; Mon, 8 Jan 2024 22:51:46 +0100 (CET) Date: Mon, 8 Jan 2024 22:51:46 +0100 From: Mark Wielaard To: Alan Modra Cc: "H.J. Lu" , Indu Bhagat , Jan Beulich , Jin Ma , Mike Frysinger , Tamar Christina , Tejas Joshi , Tom de Vries , binutils@sourceware.org, gdb-testers@sourceware.org, Arsen =?utf-8?Q?Arsenovi=C4=87?= , Sam James Subject: Re: =?utf-8?B?4pigIEJ1aWxkYm90IChTb3VyY2V3?= =?utf-8?Q?are=29=3A_binutils-gdb-autorege?= =?utf-8?Q?n?= - failed 'git diff ...' (failure) (master) Message-ID: <20240108215146.GB26453@gnu.wildebeest.org> References: <20240107052456.A09763858D35@sourceware.org> <20240107172936.GX26453@gnu.wildebeest.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-9.0 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: Hi Alan, On Mon, Jan 08, 2024 at 10:54:09AM +1030, Alan Modra wrote: > On Sun, Jan 07, 2024 at 06:29:36PM +0100, Mark Wielaard wrote: > > So the autogen tester would like to move these entries back to where > > they were before. > > So why are the aclocal.m4 dependencies being sorted differently? It > seems to me that what is currently in libcollector/aclocal.m4: > > m4_include([../../config/depstand.m4]) > m4_include([../../config/lead-dot.m4]) > m4_include([../../config/override.m4]) > m4_include([../../config/warnings.m4]) > m4_include([../../libtool.m4]) > m4_include([../../ltoptions.m4]) > m4_include([../../ltsugar.m4]) > m4_include([../../ltversion.m4]) > m4_include([../../lt~obsolete.m4]) > > is sorted correctly. This is the result I get by configuring with > --enable-maintainer-mode, and until I see others getting a different > result with --enable-maintainer-mode and the "correct" versions of > auto tools, I'm going to say the tester is doing something wrong. You are right. There is a difference between what --enable-maintainer-mode does and what autoregen.py does. autoregen.py doesn't fully handle the (order of directories) of AC_CONFIG_MACRO_DIRS in gprofng/libcollector/configure.ac. We can make this the same by using the following hack in autoregen.py 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') Checked this doesn't break anything for gcc, which uses the same script. Pushed to builder. Cheers, Mark