[PATCH 1/5] autoregen.py: enable autoreconf for gcc, libdecnumber, libiberty, libobjc

[PATCH 1/5] autoregen.py: enable autoreconf for gcc, libdecnumber, libiberty, libobjc

[Christophe Lyon]

Calling just 'autoreconf' works well for these subdirs despite the
absence of Makefile.am: there's no real need to provide -I xxxx flags
when calling aclocal, the generated files are the same.

It does make a difference for gcc and libobjc however: some warnings
are printed by autoreconf, because additional .m4 files are parsed in
a different order by plain 'aclocal' and 'aclocal -I xxx'.

We can accept that for the buildbot, for the sake of simplicity of
this helper, but that may confuse users.
---
 builder/containers/autoregen.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index 64d132e..38cbdae 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -73,7 +73,7 @@ AUTORECONF_DIRS = [
 
     # gcc subdirs
     "c++tools", # No aclocal.m4
-    #"gcc", # No Makefile.am
+    "gcc", # No Makefile.am
     #"fixincludes", # autoreconf complains about GCC_AC_FUNC_MMAP_BLACKLIST
     "gnattools", # No aclocal.m4
     "gotools",
@@ -83,7 +83,7 @@ AUTORECONF_DIRS = [
     "libcc1",
     "libcody", # No aclocal.m4
     #"libcpp", # No Makefile.am
-    #"libdecnumber", # No Makefile.am
+    "libdecnumber", # No Makefile.am
     "libffi",
     "libgcc", # No aclocal.m4
     "libgfortran",
@@ -94,9 +94,9 @@ AUTORECONF_DIRS = [
     "libgo",
     "libgomp",
     "libgrust",
-    #"libiberty", # No Makefile.am
+    "libiberty", # No Makefile.am
     "libitm",
-    #"libobjc", # No Makefile.am
+    "libobjc", # No Makefile.am
     "libphobos",
     "libquadmath",
     "libsanitizer",
@@ -149,7 +149,7 @@ def regenerate_manually():
             include_arg = "-I.."
             include_arg2 = "-I../config"
 
-        if folder.stem == "libgm2" or folder.stem == "gcc" or folder.stem == "libiberty" or folder.stem == "libobjc":
+        if folder.stem == "libgm2":
             include_arg = "-I../config"
             include_arg2 = "-I.."
 
-- 
2.34.1

[PATCH 2/5] autoregen.py: Move subdirs common to binutils-gdb and gcc...

[Christophe Lyon]

... at the beginning of AUTORECONF_DIRS.

Just for the sake of clarity.
---
 builder/containers/autoregen.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index 38cbdae..dcd5fc7 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -52,6 +52,12 @@ SKIP_DIRS = [
 # these directories are known to can be re-generatable with a simple autoreconf
 # without special -I flags
 AUTORECONF_DIRS = [
+    # subdirs common to binutils-gdb and gcc
+    "libbacktrace",
+    "libdecnumber", # No Makefile.am
+    "libiberty", # No Makefile.am
+    "zlib",
+
     # binutils-gdb subdirs
     "bfd",
     "binutils",
@@ -79,11 +85,9 @@ AUTORECONF_DIRS = [
     "gotools",
     "libada", # No aclocal.m4
     "libatomic",
-    "libbacktrace",
     "libcc1",
     "libcody", # No aclocal.m4
     #"libcpp", # No Makefile.am
-    "libdecnumber", # No Makefile.am
     "libffi",
     "libgcc", # No aclocal.m4
     "libgfortran",
@@ -94,7 +98,6 @@ AUTORECONF_DIRS = [
     "libgo",
     "libgomp",
     "libgrust",
-    "libiberty", # No Makefile.am
     "libitm",
     "libobjc", # No Makefile.am
     "libphobos",
@@ -105,7 +108,6 @@ AUTORECONF_DIRS = [
     # This does not cover libvtv/testsuite/other-tests/Makefile.in
     "libvtv",
     "lto-plugin",
-    "zlib",
 ]
 
 
-- 
2.34.1

[PATCH 3/5] autoregen.py: improve comment

[Christophe Lyon]

Make it clearer that we use regenerate_manually() by default.
---
 builder/containers/autoregen.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index dcd5fc7..f776aad 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -49,8 +49,10 @@ SKIP_DIRS = [
     "libcpp",
 ]
 
-# these directories are known to can be re-generatable with a simple autoreconf
+# these directories are known to be re-generatable with a simple autoreconf
 # without special -I flags
+# Entries commented out (and directories not listed) are handled by
+# regenerate_manually().
 AUTORECONF_DIRS = [
     # subdirs common to binutils-gdb and gcc
     "libbacktrace",
-- 
2.34.1

[PATCH 4/5] autoregen.py: libcpp can use autoreconf

[Christophe Lyon]

After libcpp's aclocal.m4 and configure were fixed in GCC, we can now
use autoreconf for it too.
---
 builder/containers/autoregen.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index f776aad..277dcb7 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -43,10 +43,6 @@ SKIP_DIRS = [
     # readline and minizip are maintained with different autotools versions
     "readline",
     "minizip",
-
-    # aclocal.m4 gets an additional ../config/override.m4,
-    # and config.in gets a few more empty lines.
-    "libcpp",
 ]
 
 # these directories are known to be re-generatable with a simple autoreconf
@@ -89,7 +85,7 @@ AUTORECONF_DIRS = [
     "libatomic",
     "libcc1",
     "libcody", # No aclocal.m4
-    #"libcpp", # No Makefile.am
+    "libcpp", # No Makefile.am
     "libffi",
     "libgcc", # No aclocal.m4
     "libgfortran",
-- 
2.34.1

[PATCH 5/5] autoregen.py: Add introduction comment

[Christophe Lyon]

To give more context to users, with the plan of moving this file to
contrib/ in binutils-gdb and gcc repositories.
---
 builder/containers/autoregen.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index 277dcb7..c392bf8 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -1,5 +1,12 @@
 #!/usr/bin/env python3
 
+# This script helps to regenerate files managed by autotools and
+# autogen in binutils-gdb and gcc repositories.
+
+# In can be used by buildbots to check that the current repository
+# contents has been updated correctly, and by developers to update
+# such files as expected.
+
 import os
 import shutil
 import subprocess
-- 
2.34.1

Re: [PATCH 5/5] autoregen.py: Add introduction comment

[Simon Marchi]

On 2024-04-17 10:50, Christophe Lyon wrote:
> To give more context to users, with the plan of moving this file to
> contrib/ in binutils-gdb and gcc repositories.
> ---
>  builder/containers/autoregen.py | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
> index 277dcb7..c392bf8 100755
> --- a/builder/containers/autoregen.py
> +++ b/builder/containers/autoregen.py
> @@ -1,5 +1,12 @@
>  #!/usr/bin/env python3
>  
> +# This script helps to regenerate files managed by autotools and
> +# autogen in binutils-gdb and gcc repositories.
> +
> +# In can be used by buildbots to check that the current repository

In -> It

Otherwise, the series LGTM.

Simon

Re: [PATCH 5/5] autoregen.py: Add introduction comment

[Christophe Lyon]

On Wed, 17 Apr 2024 at 17:12, Simon Marchi <simark@simark.ca> wrote:
>
>
>
> On 2024-04-17 10:50, Christophe Lyon wrote:
> > To give more context to users, with the plan of moving this file to
> > contrib/ in binutils-gdb and gcc repositories.
> > ---
> >  builder/containers/autoregen.py | 7 +++++++
> >  1 file changed, 7 insertions(+)
> >
> > diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
> > index 277dcb7..c392bf8 100755
> > --- a/builder/containers/autoregen.py
> > +++ b/builder/containers/autoregen.py
> > @@ -1,5 +1,12 @@
> >  #!/usr/bin/env python3
> >
> > +# This script helps to regenerate files managed by autotools and
> > +# autogen in binutils-gdb and gcc repositories.
> > +
> > +# In can be used by buildbots to check that the current repository
>
> In -> It
>
> Otherwise, the series LGTM.

Gasp, sorry for the typo, thanks for catching it.

Mark, I don't think I have commit rights, so if you are OK with the
series, can you commit it with the typo fixed?

Once this is in place, I'll submit patches to add this script to
contrib/ in gcc and binutils-gdb.


Thanks,

Christophe

>
> Simon

Re: [PATCH 4/5] autoregen.py: libcpp can use autoreconf

[Mark Wielaard]

Hi,

On Wed, Apr 17, 2024 at 02:50:32PM +0000, Christophe Lyon wrote:
> After libcpp's aclocal.m4 and configure were fixed in GCC, we can now
> use autoreconf for it too.

This works now, but it does show some warnings:

Entering directory /home/mark/src/gcc/libcpp
+ autoreconf-2.69 -f
configure.ac:91: warning: macro 'AM_LANGINFO_CODESET' not found in library
configure.ac:112: warning: macro 'AM_ICONV' not found in library
autoreconf-2.69: configure.ac: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION

Re: [PATCH 1/5] autoregen.py: enable autoreconf for gcc, libdecnumber, libiberty, libobjc

[Mark Wielaard]

On Wed, Apr 17, 2024 at 02:50:29PM +0000, Christophe Lyon wrote:
> Calling just 'autoreconf' works well for these subdirs despite the
> absence of Makefile.am: there's no real need to provide -I xxxx flags
> when calling aclocal, the generated files are the same.
> 
> It does make a difference for gcc and libobjc however: some warnings
> are printed by autoreconf, because additional .m4 files are parsed in
> a different order by plain 'aclocal' and 'aclocal -I xxx'.
> 
> We can accept that for the buildbot, for the sake of simplicity of
> this helper, but that may confuse users.

Yeah, it is a little confusing. But hard to notice given the large
number of warning in some of the other directories. Which is another
problem when people run it by hand.

Cheers,

Mark

Re: [PATCH 5/5] autoregen.py: Add introduction comment

[Mark Wielaard]

Hi Christophe,

On Thu, Apr 18, 2024 at 11:59:19AM +0200, Christophe Lyon wrote:
> On Wed, 17 Apr 2024 at 17:12, Simon Marchi <simark@simark.ca> wrote:
> > > --- a/builder/containers/autoregen.py
> > > +++ b/builder/containers/autoregen.py
> > > @@ -1,5 +1,12 @@
> > >  #!/usr/bin/env python3
> > >
> > > +# This script helps to regenerate files managed by autotools and
> > > +# autogen in binutils-gdb and gcc repositories.
> > > +
> > > +# In can be used by buildbots to check that the current repository
> >
> > In -> It
> >
> > Otherwise, the series LGTM.
> 
> Gasp, sorry for the typo, thanks for catching it.
> 
> Mark, I don't think I have commit rights, so if you are OK with the
> series, can you commit it with the typo fixed?

Pushed.

Thanks,

Mark

Re: [PATCH 4/5] autoregen.py: libcpp can use autoreconf

[Christophe Lyon]

On Thu, 18 Apr 2024 at 23:46, Mark Wielaard <mark@klomp.org> wrote:
>
> Hi,
>
> On Wed, Apr 17, 2024 at 02:50:32PM +0000, Christophe Lyon wrote:
> > After libcpp's aclocal.m4 and configure were fixed in GCC, we can now
> > use autoreconf for it too.
>
> This works now, but it does show some warnings:
>
> Entering directory /home/mark/src/gcc/libcpp
> + autoreconf-2.69 -f
> configure.ac:91: warning: macro 'AM_LANGINFO_CODESET' not found in library
> configure.ac:112: warning: macro 'AM_ICONV' not found in library
> autoreconf-2.69: configure.ac: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION
>
Indeed, but since the results is the same as what is in the repo, I
think it's OK.
I suspect this is a matter of (missing?) -I xxxx as discussed in the
other thread)

Thanks,

Christophe

Re: [PATCH 1/5] autoregen.py: enable autoreconf for gcc, libdecnumber, libiberty, libobjc

[Christophe Lyon]

On Thu, 18 Apr 2024 at 23:53, Mark Wielaard <mark@klomp.org> wrote:
>
> On Wed, Apr 17, 2024 at 02:50:29PM +0000, Christophe Lyon wrote:
> > Calling just 'autoreconf' works well for these subdirs despite the
> > absence of Makefile.am: there's no real need to provide -I xxxx flags
> > when calling aclocal, the generated files are the same.
> >
> > It does make a difference for gcc and libobjc however: some warnings
> > are printed by autoreconf, because additional .m4 files are parsed in
> > a different order by plain 'aclocal' and 'aclocal -I xxx'.
> >
> > We can accept that for the buildbot, for the sake of simplicity of
> > this helper, but that may confuse users.
>
> Yeah, it is a little confusing. But hard to notice given the large
> number of warning in some of the other directories. Which is another
> problem when people run it by hand.
>

Yes, it's good to have the buildbot to confirm it sees the same
warnings as people see when running the tools by hand.

And I agree that these warnings should be fixed, but that's another problem :-)

Thanks,

Christophe

> Cheers,
>
> Mark

Re: [PATCH 5/5] autoregen.py: Add introduction comment

[Christophe Lyon]

On Thu, 18 Apr 2024 at 23:55, Mark Wielaard <mark@klomp.org> wrote:
>
> Hi Christophe,
>
> On Thu, Apr 18, 2024 at 11:59:19AM +0200, Christophe Lyon wrote:
> > On Wed, 17 Apr 2024 at 17:12, Simon Marchi <simark@simark.ca> wrote:
> > > > --- a/builder/containers/autoregen.py
> > > > +++ b/builder/containers/autoregen.py
> > > > @@ -1,5 +1,12 @@
> > > >  #!/usr/bin/env python3
> > > >
> > > > +# This script helps to regenerate files managed by autotools and
> > > > +# autogen in binutils-gdb and gcc repositories.
> > > > +
> > > > +# In can be used by buildbots to check that the current repository
> > >
> > > In -> It
> > >
> > > Otherwise, the series LGTM.
> >
> > Gasp, sorry for the typo, thanks for catching it.
> >
> > Mark, I don't think I have commit rights, so if you are OK with the
> > series, can you commit it with the typo fixed?
>
> Pushed.

Great, thanks!

Christophe

>
> Thanks,
>
> Mark