mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-05 11:10:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

autoreconf --install --force: replace install-sh with no timestamp

Browse Source 
Old versions of install-sh did not have a timestamp line.  Therefore,
treat the absence of a timestamp line as indicating a very old file
(that --install --force should replace), not as an error.

Problem reported by Pascal Terjan.

* bin/autoreconf.in (extract_time_stamp): Return 1970-01-01 when
  no timestamp line is found.
* tests/torture.at (Missing auxiliary files (--force)):
  Test replacement of old install-sh with no timestamp line.
This commit is contained in:
Zack Weinberg 2020-12-08 10:32:04 -05:00
parent 9887fa54b6
commit c3afa48883
No known key found for this signature in database
GPG Key ID: 384F8E68AC65B0D5
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/autoreconf.in
View File

@ -326,7 +326,8 @@ sub extract_time_stamp
return $1;
}
}
fatal "no timestamp line found in $fname";
# Old versions of install-sh did not have a timestamp line.
return '1970-01-01';
}
# our_aux_file_is_newer ($dest, $src)

36
tests/torture.at
View File

@ -2132,40 +2132,52 @@ export ACLOCAL
AT_DATA([configure.ac],
[[AC_INIT([GNU foo], [1.0])
AC_CONFIG_AUX_DIR([build-aux])
AC_PROG_INSTALL
AC_CANONICAL_HOST
AC_OUTPUT
]])
mkdir build-aux
AT_DATA([build-aux/config.guess.old],
AT_DATA([build-aux/config-guess.old],
[[#! /bin/sh
timestamp='1970-01-01'
printf '%s\n' 'frobozz-bogon-bogos1'
]])
AT_DATA([build-aux/config.sub.new],
AT_DATA([build-aux/config-sub.new],
[[#! /bin/sh
timestamp='9999-12-31'
scriptversion='9999-12-31'
printf '%s\n' "$*"
]])
cp build-aux/config.guess.old build-aux/config.guess
cp build-aux/config.sub.new build-aux/config.sub
chmod +x build-aux/config.sub build-aux/config.guess
AT_DATA([build-aux/install-sh.old],
[[#! /bin/sh
# Old versions of install-sh did not have a timestamp line.
]])
# This pass should not change either file.
cp build-aux/config-guess.old build-aux/config.guess
cp build-aux/config-sub.new build-aux/config.sub
cp build-aux/install-sh.old build-aux/install-sh
chmod +x build-aux/config.sub build-aux/config.guess build-aux/install-sh
# This pass should not change any of the files.
AT_CHECK([autoreconf --install])
AT_CMP([build-aux/config.guess.old], [build-aux/config.guess])
AT_CMP([build-aux/config.sub.new], [build-aux/config.sub])
AT_CMP([build-aux/config-guess.old], [build-aux/config.guess])
AT_CMP([build-aux/config-sub.new], [build-aux/config.sub])
AT_CMP([build-aux/install-sh.old], [build-aux/install-sh])
# This pass should change only config.guess, not config.sub.
# This pass should change only config.guess and install-sh, not config.sub.
AT_CHECK([autoreconf --install --force])
AT_CHECK(
[if cmp build-aux/config.guess.old build-aux/config.guess > /dev/null 2>&1
[if cmp build-aux/config-guess.old build-aux/config.guess > /dev/null 2>&1
then exit 1
fi])
AT_CMP([build-aux/config-sub.new], [build-aux/config.sub])
AT_CHECK(
[if cmp build-aux/install-sh.old build-aux/install-sh > /dev/null 2>&1
then exit 1
fi])
AT_CMP([build-aux/config.sub.new], [build-aux/config.sub])
AT_CLEANUP