From d1892fd701b9bf8cbe205c45f9fd0dacee0422f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Sun, 10 Dec 2023 14:46:58 +0000 Subject: [PATCH] bootstrap: fix option propagation with --bootstrap-sync * top/bootstrap: Ensure options are propagated through upgrade_bootstrap(). * top/bootstrap-funclib.sh: Likewise. * build-aux/bootstrap: Auto generated with `make build-aux/bootstrap`. Fixes https://bugs.gnu.org/67731 --- ChangeLog | 9 +++++++++ build-aux/bootstrap | 8 ++++---- top/bootstrap | 4 ++-- top/bootstrap-funclib.sh | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a3429e03b..a017833f64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2023-12-10 Pádraig Brady + + bootstrap: fix option propagation with --bootstrap-sync + * top/bootstrap: Ensure options are propagated through + upgrade_bootstrap(). + * top/bootstrap-funclib.sh: Likewise. + * build-aux/bootstrap: Auto generated with `make build-aux/bootstrap`. + Fixes https://bugs.gnu.org/67731 + 2023-12-01 Paul Eggert frexp, frexpf: pacify clang re address-of-volatile diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 979b3af62e..e2490b8bbc 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -3,7 +3,7 @@ # Bootstrap this package from checked-out sources. -scriptversion=2023-08-29.21; # UTC +scriptversion=2023-12-10.18; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -37,7 +37,7 @@ medir=`dirname "$me"` # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2023-08-28.18; # UTC +scriptlibversion=2023-12-10.18; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -777,7 +777,7 @@ autopull() if $use_gnulib || $bootstrap_sync; then prepare_GNULIB_SRCDIR if $bootstrap_sync; then - upgrade_bootstrap + upgrade_bootstrap "$@" fi fi @@ -1496,7 +1496,7 @@ check_build_prerequisites $use_git if $bootstrap_sync; then prepare_GNULIB_SRCDIR - upgrade_bootstrap + upgrade_bootstrap "$@" # Since we have now upgraded if needed, no need to try it a second time below. bootstrap_sync=false fi diff --git a/top/bootstrap b/top/bootstrap index 6c170d35de..26dad58046 100755 --- a/top/bootstrap +++ b/top/bootstrap @@ -1,7 +1,7 @@ #! /bin/sh # Bootstrap this package from checked-out sources. -scriptversion=2023-08-29.21; # UTC +scriptversion=2023-12-10.18; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -192,7 +192,7 @@ check_build_prerequisites $use_git if $bootstrap_sync; then prepare_GNULIB_SRCDIR - upgrade_bootstrap + upgrade_bootstrap "$@" # Since we have now upgraded if needed, no need to try it a second time below. bootstrap_sync=false fi diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh index 54deea66a2..c6dbeacf7f 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-08-29.21; # UTC +scriptlibversion=2023-12-10.18; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -740,7 +740,7 @@ autopull() if $use_gnulib || $bootstrap_sync; then prepare_GNULIB_SRCDIR if $bootstrap_sync; then - upgrade_bootstrap + upgrade_bootstrap "$@" fi fi -- 2.39.5