From: Simon Josefsson Date: Thu, 27 Mar 2025 19:01:28 +0000 (+0100) Subject: bootstrap: Improve "make dist" tarball reproducability. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=54fc57c23dcd833819a7adbdfcc3bd1c805103a8;p=gnulib.git bootstrap: Improve "make dist" tarball reproducability. * top/bootstrap-funclib.sh (autogen): Don't pass unnecessary -I's when invoking autoreconf. The order of M4 include directories is reflected in Makefile.in content. Our GNUmakefile _version rule invoke autoreconf without any extra -I, and this difference in how autoreconf is invoked results in different tarballs for "make dist" vs "make release" which is undesirable. --- diff --git a/ChangeLog b/ChangeLog index a6b62b9f44..53fa2eb158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2025-03-27 Simon Josefsson + + bootstrap: Improve "make dist" tarball reproducability. + * top/bootstrap-funclib.sh (autogen): Don't pass unnecessary -I's + when invoking autoreconf. The order of M4 include directories is + reflected in Makefile.in content. Our GNUmakefile _version rule + invoke autoreconf without any extra -I, and this difference in how + autoreconf is invoked results in different tarballs for "make + dist" vs "make release" which is undesirable. + 2025-03-27 Simon Josefsson maintainer-makefile: Check spelling using 'codespell'. diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh index 47e015bd24..81884cc8b3 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=2025-02-16.12; # UTC +scriptlibversion=2025-03-27.18; # UTC # Copyright (C) 2003-2025 Free Software Foundation, Inc. # @@ -1300,7 +1300,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="--verbose --install --force $ACLOCAL_FLAGS" AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive" # Tell autoreconf not to invoke autopoint or libtoolize; they were run above.