From: Mark Wielaard <mark@klomp.org>
To: Alan Modra <amodra@gmail.com>
Cc: "H.J. Lu" <hjl.tools@gmail.com>,
"Indu Bhagat" <indu.bhagat@oracle.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Jin Ma" <jinma@linux.alibaba.com>,
"Mike Frysinger" <vapier@gentoo.org>,
"Tamar Christina" <tamar.christina@arm.com>,
"Tejas Joshi" <TejasSanjay.Joshi@amd.com>,
"Tom de Vries" <tdevries@suse.de>,
binutils@sourceware.org, gdb-testers@sourceware.org,
"Arsen Arsenović" <arsen@aarsen.me>, "Sam James" <sam@gentoo.org>
Subject: Re: ☠ Buildbot (Sourceware): binutils-gdb-autoregen - failed 'git diff ...' (failure) (master)
Date: Mon, 8 Jan 2024 22:51:46 +0100 [thread overview]
Message-ID: <20240108215146.GB26453@gnu.wildebeest.org> (raw)
In-Reply-To: <ZZtAqXYFRxWeue6F@squeak.grove.modra.org>
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
next prev parent reply other threads:[~2024-01-08 21:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-07 5:24 builder
2024-01-07 17:29 ` Mark Wielaard
2024-01-08 0:24 ` Alan Modra
2024-01-08 21:51 ` Mark Wielaard [this message]
2024-01-08 23:28 ` Alan Modra
-- strict thread matches above, loose matches on Subject: below --
2024-06-09 23:18 builder
2024-03-11 17:03 builder
2024-01-16 3:24 builder
2024-01-15 22:57 builder
2024-01-15 18:05 builder
2024-01-15 14:13 builder
2024-01-15 14:11 builder
2024-01-15 14:10 builder
2024-01-12 22:50 builder
2024-01-11 2:29 builder
2024-01-05 15:01 builder
2024-01-05 10:25 builder
2024-01-04 13:35 builder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240108215146.GB26453@gnu.wildebeest.org \
--to=mark@klomp.org \
--cc=TejasSanjay.Joshi@amd.com \
--cc=amodra@gmail.com \
--cc=arsen@aarsen.me \
--cc=binutils@sourceware.org \
--cc=gdb-testers@sourceware.org \
--cc=hjl.tools@gmail.com \
--cc=indu.bhagat@oracle.com \
--cc=jbeulich@suse.com \
--cc=jinma@linux.alibaba.com \
--cc=sam@gentoo.org \
--cc=tamar.christina@arm.com \
--cc=tdevries@suse.de \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).