☠ Buildbot (Sourceware): binutils-gdb-autoregen - failed 'git diff ...' (failure) (master)

[Mark Wielaard]

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