* [PATCH] bootstrap: remove code that accommodated RHEL5's old autoreconf
@ 2023-03-09 16:47 Jim Meyering
2023-03-09 17:14 ` Bruno Haible
0 siblings, 1 reply; 4+ messages in thread
From: Jim Meyering @ 2023-03-09 16:47 UTC (permalink / raw)
To: bug-gnulib
[-- Attachment #1: Type: text/plain, Size: 29 bytes --]
FYI, I've just pushed this:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gnulib-bootstrap-rhel5.patch --]
[-- Type: text/x-patch, Size: 3681 bytes --]
From 074cf4b3753f2f37927eebdad8ebb1dd74ba057f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Thu, 9 Mar 2023 08:41:07 -0800
Subject: [PATCH] bootstrap: remove code that accommodated RHEL5's old
autoreconf
* top/bootstrap-funclib.sh (autogen) [AUTORECONFFLAGS]: RHEL5 has not
been supported since 2017. It included (and this code worked around)
a version of autoreconf that was so old it did not accept the
--no-recursive option. Drop that workaround.
* build-aux/bootstrap: Regenerate.
---
ChangeLog | 9 +++++++++
build-aux/bootstrap | 10 +---------
top/bootstrap-funclib.sh | 10 +---------
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fc3bf8e087..16b4eb3170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-03-09 Jim Meyering <meyering@fb.com>
+
+ bootstrap: remove code that accommodated RHEL5's old autoreconf
+ * top/bootstrap-funclib.sh (autogen) [AUTORECONFFLAGS]: RHEL5 has not
+ been supported since 2017. It included (and this code worked around)
+ a version of autoreconf that was so old it did not accept the
+ --no-recursive option. Drop that workaround.
+ * build-aux/bootstrap: Regenerate.
+
2023-03-08 Bruno Haible <bruno@clisp.org>
gettimeofday, timespec_get tests: Avoid test failure on glibc/Linux.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index c6c4901d3f..e634872de1 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -37,7 +37,7 @@ medir=`dirname "$me"`
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2023-01-06.19; # UTC
+scriptlibversion=2023-03-09.14; # UTC
# Copyright (C) 2003-2023 Free Software Foundation, Inc.
#
@@ -1237,14 +1237,6 @@ autogen()
# such as ylwrap.
AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
- # Some systems (RHEL 5) are using ancient autotools, for which the
- # --no-recursive option had not been invented. Detect that lack and
- # omit the option when it's not supported. FIXME in 2017: remove this
- # hack when RHEL 5 autotools are updated, or when they become irrelevant.
- case $($AUTORECONF --help) in
- *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
- esac
-
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh
index fca6a0392e..b6960dd4c6 100644
--- a/top/bootstrap-funclib.sh
+++ b/top/bootstrap-funclib.sh
@@ -1,6 +1,6 @@
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2023-01-06.19; # UTC
+scriptlibversion=2023-03-09.14; # UTC
# Copyright (C) 2003-2023 Free Software Foundation, Inc.
#
@@ -1200,14 +1200,6 @@ autogen()
# such as ylwrap.
AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
- # Some systems (RHEL 5) are using ancient autotools, for which the
- # --no-recursive option had not been invented. Detect that lack and
- # omit the option when it's not supported. FIXME in 2017: remove this
- # hack when RHEL 5 autotools are updated, or when they become irrelevant.
- case $($AUTORECONF --help) in
- *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
- esac
-
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
--
2.40.0.rc2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] bootstrap: remove code that accommodated RHEL5's old autoreconf
2023-03-09 16:47 [PATCH] bootstrap: remove code that accommodated RHEL5's old autoreconf Jim Meyering
@ 2023-03-09 17:14 ` Bruno Haible
2023-03-09 18:01 ` Jim Meyering
0 siblings, 1 reply; 4+ messages in thread
From: Bruno Haible @ 2023-03-09 17:14 UTC (permalink / raw)
To: bug-gnulib; +Cc: Jim Meyering
Hi Jim,
$ /gnu-inst-autoconf/2.59/bin/autoreconf --help | grep no-recursive
$ /gnu-inst-autoconf/2.60/bin/autoreconf --help | grep no-recursive
--no-recursive don't rebuild sub-packages
$ /gnu-inst-autoconf/2.71/bin/autoreconf --help | grep no-recursive
--no-recursive don't rebuild sub-packages
So, old Autoconf versions did not support the --no-recursive option,
but new versions do.
Your patch claims to "Drop that workaround", but in fact, what it does,
is to treat *all* autoconf versions as if they were old. It should
do the opposite: use the option --no-recursive unconditionally.
Bruno
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] bootstrap: remove code that accommodated RHEL5's old autoreconf
2023-03-09 17:14 ` Bruno Haible
@ 2023-03-09 18:01 ` Jim Meyering
2023-03-09 18:30 ` Bruno Haible
0 siblings, 1 reply; 4+ messages in thread
From: Jim Meyering @ 2023-03-09 18:01 UTC (permalink / raw)
To: Bruno Haible; +Cc: bug-gnulib
[-- Attachment #1: Type: text/plain, Size: 780 bytes --]
On Thu, Mar 9, 2023 at 9:14 AM Bruno Haible <bruno@clisp.org> wrote:
> Hi Jim,
>
> $ /gnu-inst-autoconf/2.59/bin/autoreconf --help | grep no-recursive
> $ /gnu-inst-autoconf/2.60/bin/autoreconf --help | grep no-recursive
> --no-recursive don't rebuild sub-packages
> $ /gnu-inst-autoconf/2.71/bin/autoreconf --help | grep no-recursive
> --no-recursive don't rebuild sub-packages
>
> So, old Autoconf versions did not support the --no-recursive option,
> but new versions do.
>
> Your patch claims to "Drop that workaround", but in fact, what it does,
> is to treat *all* autoconf versions as if they were old. It should
> do the opposite: use the option --no-recursive unconditionally.
Thanks for catching that.
Here's a proposed fix:
[-- Attachment #2: gnulib-bootstrap-rhel5-v2.patch --]
[-- Type: application/octet-stream, Size: 2709 bytes --]
From 0e272413ec0a8a7a08940bc7328224e9972c718f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Thu, 9 Mar 2023 09:58:35 -0800
Subject: [PATCH] bootstrap: correct last change
* top/bootstrap-funclib.sh (autogen) [AUTORECONFFLAGS]: Do always
apply the --no-recursive option.
* build-aux/bootstrap: Regenerate.
Spotted by Bruno Haible.
---
ChangeLog | 5 +++++
build-aux/bootstrap | 3 ++-
top/bootstrap-funclib.sh | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 16b4eb3170..98c27d2218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2023-03-09 Jim Meyering <meyering@fb.com>
+ bootstrap: correct last change
+ * top/bootstrap-funclib.sh (autogen) [AUTORECONFFLAGS]: Do always
+ apply the --no-recursive option.
+ * build-aux/bootstrap: Regenerate.
+
bootstrap: remove code that accommodated RHEL5's old autoreconf
* top/bootstrap-funclib.sh (autogen) [AUTORECONFFLAGS]: RHEL5 has not
been supported since 2017. It included (and this code worked around)
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index e634872de1..b1350ff003 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -37,7 +37,7 @@ medir=`dirname "$me"`
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2023-03-09.14; # UTC
+scriptlibversion=2023-03-09.17; # UTC
# Copyright (C) 2003-2023 Free Software Foundation, Inc.
#
@@ -1236,6 +1236,7 @@ autogen()
# Invoke autoreconf with --force --install to ensure upgrades of tools
# such as ylwrap.
AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
+ AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive"
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh
index b6960dd4c6..640f0e2ecc 100644
--- a/top/bootstrap-funclib.sh
+++ b/top/bootstrap-funclib.sh
@@ -1,6 +1,6 @@
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2023-03-09.14; # UTC
+scriptlibversion=2023-03-09.17; # UTC
# Copyright (C) 2003-2023 Free Software Foundation, Inc.
#
@@ -1199,6 +1199,7 @@ autogen()
# Invoke autoreconf with --force --install to ensure upgrades of tools
# such as ylwrap.
AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
+ AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive"
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
--
2.40.0.rc2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] bootstrap: remove code that accommodated RHEL5's old autoreconf
2023-03-09 18:01 ` Jim Meyering
@ 2023-03-09 18:30 ` Bruno Haible
0 siblings, 0 replies; 4+ messages in thread
From: Bruno Haible @ 2023-03-09 18:30 UTC (permalink / raw)
To: Jim Meyering; +Cc: bug-gnulib
Jim Meyering wrote:
> Here's a proposed fix:
This looks correct.
Bruno
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-09 18:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-09 16:47 [PATCH] bootstrap: remove code that accommodated RHEL5's old autoreconf Jim Meyering
2023-03-09 17:14 ` Bruno Haible
2023-03-09 18:01 ` Jim Meyering
2023-03-09 18:30 ` Bruno Haible
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).