From: Paul Eggert Date: Mon, 27 Apr 2026 20:43:50 +0000 (-0700) Subject: maint: omit trailing whitespace X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;p=thirdparty%2Fautomake.git maint: omit trailing whitespace --- diff --git a/HACKING b/HACKING index e881aa6d1..90d5ec233 100644 --- a/HACKING +++ b/HACKING @@ -547,7 +547,7 @@ release (x.y.z), say 1.17.1, we would have 1.17.0.91 for the initial post-release development version, 1.17.0.92 for the first pretest, etc. (Just "make" will fail after this; do "make bootstrap", as below.) - + Before 1.17 (July 2024), we used suffixed letters for pretests, as is traditional, but deficient sorting algorithms did not like that. The code in lib/Automake/Version.pm, along with the regexp in @@ -622,7 +622,7 @@ tarballs (again, so hopefully no changes have been made in the meantime), and invoke the 'gnupload' script sign and upload them to the correct locations. - + There can be a delay of up to several minutes before the new files appear on the server. @@ -678,7 +678,7 @@ if it is an alpha or beta release, announcement should be sent also to , to maximize the possibility of early testing on the widest variety of systems. - + Finally, copy an abridged version of the announcement into the NEWS feed at: . Be sure to link a version to the complete announcement (as archived at any of the @@ -691,7 +691,7 @@ instructions in https://gnu.org/prep/maintain/maintain.html#Automated-Upload-Registration. The FSF sysadmins may need to be reminded to install new keys. - + A preliminary step is to check https://savannah.gnu.org/project/release-gpgkeys.php?group=automake which has a link to download automake-keyring.gpg; the new key should diff --git a/NEWS b/NEWS index 8c78b926c..786255932 100644 --- a/NEWS +++ b/NEWS @@ -62,7 +62,7 @@ New in 1.18 (2025-05-25): - The test infrastructure sets the CONFIG_SITE environment variable to /dev/null, to avoid the local system's Autoconf site defaults from breaking the test environment. (bug#76622) - + - AM_SILENT_RULES once again always ends with a newline. (bug#72267) - AM_SANITY_CHECK now outputs "no" on failure, so that a complete line diff --git a/bin/aclocal.in b/bin/aclocal.in index b92fb3957..56f3296d7 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -1176,17 +1176,17 @@ sub parse_arguments () sub parse_ACLOCAL_PATH () { return if not $aclocal_path; - + # Directories in ACLOCAL_PATH should take precedence over system # directories, so we use unshift. However, directories that # come first in ACLOCAL_PATH take precedence over directories # coming later, which is why the result of split is reversed. - + # OS/2 and Windows (but not Cygwin, etc.) use ; for the path separator. # Possibly it would be cleaner to use path_sep from Config, # but this seems simpler. my $path_sep = $^O =~ /^(os2|mswin)/i ? ';' : ':'; - + foreach my $dir (reverse split $path_sep, $aclocal_path) { unshift (@system_includes, $dir) if $dir ne '' && -d $dir; diff --git a/bin/automake.in b/bin/automake.in index 94420b800..f7e84ebcc 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -5668,7 +5668,7 @@ sub scan_autoconf_files () { require_conf_file ($required_aux_file{$file}->get, FOREIGN, $file) } - + my $auxdir_install_dot_sh = "$config_aux_dir/install.sh"; # Maybe there is a way to report the line number of the # AC_CONFIG_AUX_DIR call in configure.ac? Don't know. diff --git a/doc/automake.texi b/doc/automake.texi index 1268bc53f..eeacee762 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -5744,7 +5744,7 @@ release), and Libtool in another (e.g., for general system use), @code{LT_INIT} won't be defined. The best solution is to run @command{libtoolize} in the tree that is -using the separately-installed Automake. That will copy +using the separately-installed Automake. That will copy @file{libtool.m4} and the other Libtool M4 files and scripts into your package, including @file{ltmain.sh} (see previous section). If you have subpackages that use Libtool independently, you'll need to run diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 5bf94fe62..af911b4d7 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -754,7 +754,7 @@ sub scan_variable_expansions ($) # we check for $var being defined because NetworkManager and other # packages use the strange construct $(). # https://lists.gnu.org/archive/html/automake/2024-06/msg00085.html - + # The occurrence may look like $(string1[:subst1=[subst2]]) but # we want only 'string1'. $var =~ s/:[^:=]*=[^=]*$//; diff --git a/lib/py-compile b/lib/py-compile index 2cef53332..08650fbf4 100755 --- a/lib/py-compile +++ b/lib/py-compile @@ -1,7 +1,7 @@ #!/bin/sh # py-compile - Compile a Python program -scriptversion=2025-06-18.21; # UTC +scriptversion=2026-04-27.20; # UTC # Copyright (C) 2000-2026 Free Software Foundation, Inc. @@ -49,7 +49,7 @@ if $PYTHON -V 2>/dev/null | grep -i python >/dev/null; then :; else exit 0 fi fi - + usage_error () { echo "$me: $*" >&2 diff --git a/m4/sanity.m4 b/m4/sanity.m4 index 046a6f9e7..587ca2839 100644 --- a/m4/sanity.m4 +++ b/m4/sanity.m4 @@ -36,7 +36,7 @@ am_cv_filesystem_timestamp_resolution=2 # Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work, # - 1 sec is not much of a win compared to 2 sec, and # - it takes 2 seconds to perform the test whether 1 sec works. -# +# # Instead, just use the default 2s on platforms that have 1s resolution, # accept the extra 1s delay when using $sleep in the Automake tests, in # exchange for not incurring the 2s delay for running the test for all @@ -109,7 +109,7 @@ for am_try_res in $am_try_resolutions; do # everything else supports the subsecond mtimes, but make doesn't; # notably on macOS, which ships make 3.81 from 2006 (the last one # released under GPLv2). https://bugs.gnu.org/68808 - # + # # We test $MAKE if it is defined in the environment, else "make". # It might get overridden later, but our hope is that in practice # it does not matter: it is the system "make" which is (by far) diff --git a/t/all.sh b/t/all.sh index 519cabac0..1e170c748 100644 --- a/t/all.sh +++ b/t/all.sh @@ -27,7 +27,7 @@ $AUTOMAKE for target in $targets; do grep "${target}-local" Makefile.in # For debugging. - + # This grep fails, thus the test is listed in XFAIL. # We're checking that (e.g.) all-am does not depend on all-local, # but why? diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in index efa26f2f6..d0021d05a 100644 --- a/t/ax/test-defs.in +++ b/t/ax/test-defs.in @@ -198,7 +198,7 @@ case $MTIME_RESOLUTION in if test -n "$am_cv_filesystem_timestamp_resolution"; then #echo "$BASH_SOURCE: amftr=$am_cv_filesystem_timestamp_resolution" >&2 MTIME_RESOLUTION=$am_cv_filesystem_timestamp_resolution - + elif test -n "$MTIME_RESOLUTION"; then #echo "$BASH_SOURCE: M_R=$MTIME_RESOLUTION" >&2 # This is normal when running tests: the cache variable is @@ -240,12 +240,12 @@ esac # https://lists.gnu.org/archive/html/automake/2024-06/msg00054.html # It seems a better fix would be to have Automake (in sanity.m4) figure # out the need for sleep even when AC_OUTPUT is not used. -# +# # In general, the problem is when the mtime resolution is 1 second (or # more) and the configure file is created less than 1 second ago, which # happens routinely in the tests, and for many fast-enough configure # scripts in other packages, too. -# +# # At any rate, with this set to "sleep 1", there were still random # parallelization failures; setting am_cv_sleep_fractional_seconds=no # as above was still needed. diff --git a/t/dist-no-built-sources.sh b/t/dist-no-built-sources.sh index d04f3b754..79c2b1356 100644 --- a/t/dist-no-built-sources.sh +++ b/t/dist-no-built-sources.sh @@ -19,12 +19,12 @@ . test-init.sh # the tests are almost the same, so do a loop with a couple conditionals. -# +# # test-init.sh creates configure.ac with an AM_INIT_AUTOMAKE call with # no options. The default is [no-no-]dist-built-sources, i.e., distdir # does depend on $(BUILT_SOURCES), so test that first. (There is no # Automake option named dist-built-sources, only --no-no-dist-built-sources.) -# +# # The second time around, add the no-dist-built-sources option, # and the distdir target should not depend on anything. # diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh index 792f32b81..d551b26c7 100644 --- a/t/instdir-ltlib.sh +++ b/t/instdir-ltlib.sh @@ -17,11 +17,11 @@ # If $(libdir) or $(pyexecdir) is the empty string, then nothing should # be installed there, and in fact libtool will refuse to link due to the # missing argument for -rpath: -# /bin/sh ./libtool [...] -rpath libfoo.lo +# /bin/sh ./libtool [...] -rpath libfoo.lo # libtool: error: only absolute run-paths are allowed # (Hopefully the error message will be improved.) # Thus this test is expected to fail. -# +# # This test exercises some of the libtool code paths. required='cc libtoolize' diff --git a/t/tar-override.sh b/t/tar-override.sh index 687cfe589..7899aaaea 100644 --- a/t/tar-override.sh +++ b/t/tar-override.sh @@ -16,7 +16,7 @@ # Check that the user can override the tar program used by "make dist" # at runtime, by redefining the 'TAR' environment variable. -# +# # Currently this works only when the tar format used is 'v7'; # as of 2025 (automake-1.18), this is no longer the default, # so force that format in our test setup. diff --git a/t/varempty.sh b/t/varempty.sh index bd7e1796f..a3baf6885 100644 --- a/t/varempty.sh +++ b/t/varempty.sh @@ -18,7 +18,7 @@ # Use of uninitialized value $var in string eq at # .../lib/Automake/Variable.pm line 754, line 3. # (in scan_variable_expansions) -# +# # This showed up with the NetworkManager and other packages in Fedora: # https://lists.gnu.org/archive/html/automake/2024-06/msg00085.html # (The actual purpose of the "$()" is unclear.)