[PATCH v2] autoregen.py: handle aclocal

[PATCH v2] autoregen.py: handle aclocal

[Sam James]

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.
---
Check for where we are and force an include path if needed. Also, pass --force.

 builder/containers/autoregen.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index 9315334..3da6d67 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -26,6 +26,12 @@ 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')):
+        # aclocal does not support the -f short option for force
+        include_arg = ''
+        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')):
         subprocess.check_output(f'{ENV} {AUTOHEADER_BIN} -f', shell=True, encoding='utf8')
     # apparently automake is somehow unstable -> skip it for gotools
-- 
2.42.1

Re: [PATCH v2] autoregen.py: handle aclocal

[Mark Wielaard]

Hi Sam,

On Wed, 2023-11-15 at 15:17 +0000, Sam James wrote:
> 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.
> ---
> Check for where we are and force an include path if needed. Also, pass --force.

Thanks. Pushed.

Also pushed a change that touches the Containerfile so it gets
regenerated by the builders (otherwise we'll have to wait till Sunday).

Cheers,

Mark