Accepting request 867885 from home:AndreasStieger:branches:devel:tools:building

autoconf 2.71

OBS-URL: https://build.opensuse.org/request/show/867885
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=50
This commit is contained in:
Dirk Mueller 2021-01-30 12:46:58 +00:00 committed by Git OBS Bridge
parent da56b3f7cb
commit 26c712ac3d
14 changed files with 67 additions and 2147 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa9e227860d9d845c0a07f63b88c8d7a2ae1aa2345fb619384bb8accc19fecc6
size 1346528

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEgvhU885zF0uLYxdAkfzDK2dpqmQFAl/Pyp0ACgkQkfzDK2dp
qmRwHQ/+K6xxNpeHx0jWQk0GRWiYr4d00ViWAXu2El0zdNh3m3DqQGXmHtZten46
ez1v8gx4bkvStgZZGh4AgFRnR7zp0am32PwLLAGepraxD06YwlAAZgzCztFW0/9b
DQjYXlW8Jfsx0eQRNX5J41od1MCSjLwjCAx5HFUhAeniwBHrvhn/oaxnd451oJm9
LPD6oc9ccd4hh7Ff5ElWZdzi7eBOGcjox8+6lxcyieeNYOGoMtRvmrrhGV67ym0s
3Yh5nREqMsaxE7NYSuzM0T+pUZJYMal5dbWYvDdycJqLu9/UabSZLuppNVFTyYAK
43v9Xq7CvHRaJpvqhMiczyjlk86cR/SdKItTaY1ZsTATw/j8uxNTH049XIWP7bM1
oa7ypMMD779Ihk0Ci7Bl9ZJ8tjsPP1jlPRcHLoyam15HDEQcORDk3YiEJMF74XZ4
t5TTAw/bDPlGB2fHix5IrSipMaLzKHhlzGAl0exQ35liSSqI6eb2DjnyAO1P1hft
S/Ds5CsL0cRfUKzvoQTRuhJMn1caO2IZfWzCgxGKc6g9XMXyRzYCihGNKSvG1/Vl
66Chjbpv4LXFmASLY41eGclK/c+74nwP9GdO+Sn8jCJsFddlU4pXffBDsk1F+r+c
uLbSss93weH5bh6uS0ll6jU36/3YBudxBLQWDtRtW2uV9Vb8MiE=
=6ak1
-----END PGP SIGNATURE-----

BIN
autoconf-2.71.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

16
autoconf-2.71.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEgvhU885zF0uLYxdAkfzDK2dpqmQFAmATPzIACgkQkfzDK2dp
qmSrUw//Z0ncEs8SD3qn2+QYUzo5dMZ4BJi/8h9LSlRZnp+OhVqtWgCQhiW/cTaa
UXKRca7JMRTreqMhgLkRE12cEvTIUlfl1QiOluNBq1YzNeG1JMIFEVxi8JiBzCqd
s7cEgIUB0ZhhEtBAAF0ABBDJraaTYJGUxLpvzOltdiRODn6ic9XZdUga7ouWgwLM
5o78OzYXbYz2CP6DrOsfntNol4Fx2gH8hOADWOlUEzCc/580twsm2xMTu8q6+win
yIxTC5yDJdXZnP6JIFD2rrg1tfFkTom2sMVC3feFjrgRqyA4Jcyf8WpmRnC21PzD
NhEO4aejgEmkKCIDudT62vzOhPGZrKPlPA+rMcYX3Jx1rCbozAbIcsGj6mD8q75g
7BYtwJQjKLH2b4pJ0Xl6l4bVnN2o82zdWY5cHE9TI+l5ntU9yooNKlh1IAz3WFwR
PCGd0F/JIXNjBbMzqtjyzYYvlSRDvS+aLg8S+PK/wXbZBEjQOjEI+m1YyOL2N7qM
UiM04x5BNCWG672qg38NISIHJvmBdgCHiwnVLpfstQPw+Y4L8YyMZyrbj3Mtmomo
Woa9oXvv1lVT4W2PleJQ71fq8QpuW+xbM9IXdWoMp1lCEZQ0doJcTFvEhwpW3tca
oEzNdgMghMDB9TFsiTpP1YoOyvAVhRtxWgO1j9pSi3JWQZ3AjKs=
=y3Hc
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Jan 30 07:20:53 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- autoconf 2.71:
* Compilers that support C99 but not C2011 are detected correctly
* Compatibility improved with clang and Oracle C++
* Compatibility restored with automake's rules for regenerating
configure
* Compatibility restored with old versions of std-gnu11.m4
- dropped upstream patches:
* prog-c99-fix-typo.patch
* restore-compatibility-gnu11.patch
* autom4te-always-update-output-file.patch
* handle-gettext-alone.patch
-------------------------------------------------------------------
Sat Jan 16 18:47:23 UTC 2021 - Dirk Müller <dmueller@suse.com>

View File

@ -18,7 +18,7 @@
%define site_lisp %{_datadir}/emacs/site-lisp
Name: autoconf-el
Version: 2.70
Version: 2.71
Release: 0
Summary: Emacs mode for editing GNU Autoconf scripts
License: GPL-3.0-or-later

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Jan 30 07:20:53 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- autoconf 2.71:
* Compilers that support C99 but not C2011 are detected correctly
* Compatibility improved with clang and Oracle C++
* Compatibility restored with automake's rules for regenerating
configure
* Compatibility restored with old versions of std-gnu11.m4
- dropped upstream patches:
* prog-c99-fix-typo.patch
* restore-compatibility-gnu11.patch
* autom4te-always-update-output-file.patch
* handle-gettext-alone.patch
-------------------------------------------------------------------
Sat Jan 16 18:47:23 UTC 2021 - Dirk Müller <dmueller@suse.com>

View File

@ -17,7 +17,7 @@
Name: autoconf-testsuite
Version: 2.70
Version: 2.71
Release: 0
Summary: A GNU Tool for Automatically Configuring Source Code
License: GPL-3.0-or-later
@ -26,14 +26,6 @@ Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz
Source1: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz.sig
Source2: %{name}.keyring
Patch0: autoreconf-ltdl.diff
# PATCH-FIX-UPSTREAM
Patch1: https://git.savannah.gnu.org/cgit/autoconf.git/patch/?id=07130c3e48d12ec155ac5d7630dc7477b6989904#/autom4te-always-update-output-file.patch
# PATCH-FIX-UPSTREAM
Patch2: https://git.savannah.gnu.org/cgit/autoconf.git/patch/?id=05972f49ee632cd98057a3caf82ebfb9574846da#/prog-c99-fix-typo.patch
# PATCH-FIX-UPSTREAM
Patch3: https://git.savannah.gnu.org/cgit/autoconf.git/patch/?id=66fdaea3cfb4e758212c1891913e9a59441d49af#/handle-gettext-alone.patch
# PATCH-FIX-UPSTREAM https://git.savannah.gnu.org/cgit/autoconf.git/patch/?id=2d0f19d84ddb13412382674fd48e6fc5c2875d0e
Patch4: restore-compatibility-gnu11.patch
BuildRequires: help2man
BuildRequires: m4 >= 1.4.6
Requires: info
@ -60,10 +52,6 @@ only required for the generation of the scripts, not their use.
%prep
%setup -q -n autoconf-%{version}
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%configure

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Jan 30 07:20:53 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- autoconf 2.71:
* Compilers that support C99 but not C2011 are detected correctly
* Compatibility improved with clang and Oracle C++
* Compatibility restored with automake's rules for regenerating
configure
* Compatibility restored with old versions of std-gnu11.m4
- dropped upstream patches:
* prog-c99-fix-typo.patch
* restore-compatibility-gnu11.patch
* autom4te-always-update-output-file.patch
* handle-gettext-alone.patch
-------------------------------------------------------------------
Sat Jan 16 18:47:23 UTC 2021 - Dirk Müller <dmueller@suse.com>

View File

@ -17,7 +17,7 @@
Name: autoconf
Version: 2.70
Version: 2.71
Release: 0
Summary: A GNU Tool for Automatically Configuring Source Code
License: GPL-3.0-or-later
@ -26,14 +26,6 @@ Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz
Source1: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz.sig
Source2: %{name}.keyring
Patch0: autoreconf-ltdl.diff
# PATCH-FIX-UPSTREAM
Patch1: https://git.savannah.gnu.org/cgit/autoconf.git/patch/?id=07130c3e48d12ec155ac5d7630dc7477b6989904#/autom4te-always-update-output-file.patch
# PATCH-FIX-UPSTREAM
Patch2: https://git.savannah.gnu.org/cgit/autoconf.git/patch/?id=05972f49ee632cd98057a3caf82ebfb9574846da#/prog-c99-fix-typo.patch
# PATCH-FIX-UPSTREAM
Patch3: https://git.savannah.gnu.org/cgit/autoconf.git/patch/?id=66fdaea3cfb4e758212c1891913e9a59441d49af#/handle-gettext-alone.patch
# PATCH-FIX-UPSTREAM https://git.savannah.gnu.org/cgit/autoconf.git/patch/?id=2d0f19d84ddb13412382674fd48e6fc5c2875d0e
Patch4: restore-compatibility-gnu11.patch
BuildRequires: help2man
BuildRequires: m4 >= 1.4.6
Requires: info
@ -60,10 +52,6 @@ only required for the generation of the scripts, not their use.
%prep
%setup -q -n autoconf-%{version}
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%configure

View File

@ -1,99 +0,0 @@
From 07130c3e48d12ec155ac5d7630dc7477b6989904 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Tue, 29 Dec 2020 15:33:33 -0500
Subject: =?UTF-8?q?autom4te:=20always=20update=20the=20output=20file,=20ev?=
=?UTF-8?q?en=20if=20it=20hasn=E2=80=99t=20changed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Automake generates a Makefile rule for regenerating the configure
script, that relies on an invocation of autoconf always bumping the
timestamp on the configure script, even if it hasnt changed.
The patch to make autom4te update the output file atomically
(1725c947144d9bebfe7817c2c5f0d53d884b1297) broke this.
Fixes several failures in automakes test suite.
* bin/autom4te.in (handle_output): Always call update_file with force=1.
* tests/tools.at (autoconf: timestamp changes): New test.
---
bin/autom4te.in | 4 +++-
tests/tools.at | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/bin/autom4te.in b/bin/autom4te.in
index 4c2b905c..64653a44 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -609,7 +609,9 @@ sub handle_output ($$)
}
$out->close();
- update_file ($scratchfile, $output, $force)
+ # Always update the file, even if it didn't change;
+ # Automake relies on this.
+ update_file ($scratchfile, $output, 1)
if defined $scratchfile;
# If no forbidden words, we're done.
diff --git a/tests/tools.at b/tests/tools.at
index 49710202..89b8b63b 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -662,6 +662,52 @@ arbitrary $text
AT_CLEANUP
+# autoconf: timestamp changes
+# ---------------------------
+# Automake needs autoconf to update the timestamp on the configure script
+# whenever configure.ac or aclocal.m4 changes, even if the contents of the
+# configure script have not changed.
+AT_SETUP([autoconf: timestamp changes])
+
+AT_DATA([aclocal.m4],
+[[AC_DEFUN([local_KILROY], [# kilroy was here
+])
+]])
+
+AT_DATA_AUTOCONF([configure.ac],
+[[AC_INIT
+AC_PROG_CC
+local_KILROY
+AC_OUTPUT
+]])
+
+AT_CHECK_AUTOCONF
+
+cp configure configure.1
+sleep 1
+printf '%s\n' 'AC_LIBSOURCES([foo.c])dn@&t@l' >> configure.ac
+
+# This step must not use --force.
+# We don't need to check shell syntax, because if all goes well,
+# the script will be unchanged from what it was in the first autoconf
+# pass, and that was already checked.
+AT_CHECK_M4([autoconf])
+AT_CHECK([cmp configure configure.1])
+AT_CHECK([test configure -nt configure.1])
+
+cp configure configure.2
+sleep 1
+printf '%s\n' \
+ 'AC_DEFUN([unused_MACRO], [# bob was there too' \
+ '])' >> aclocal.m4
+
+# Same as above.
+AT_CHECK_M4([autoconf])
+AT_CHECK([cmp configure configure.2])
+AT_CHECK([test configure -nt configure.2])
+
+AT_CLEANUP
+
## --------- ##
## ifnames. ##
--
cgit v1.2.1

View File

@ -1,58 +0,0 @@
From 66fdaea3cfb4e758212c1891913e9a59441d49af Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Mon, 4 Jan 2021 17:27:37 -0500
Subject: =?UTF-8?q?autoreconf:=20don=E2=80=99t=20error=20out=20when=20AM?=
=?UTF-8?q?=5FGNU=5FGETTEXT=20is=20used=20alone.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some projects intentionally don't call AM_GNU_GETTEXT_(REQUIRE_)VERSION
because they have all of the gettext infrastructure checked into version
control and they want autoreconf to _not_ run autopoint. Therefore, make
the “AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_(REQUIRE_)VERSION”
and “AM_GNU_GETTEXT_(REQUIRE_)VERSION is used, but not AM_GNU_GETTEXT”
diagnostics be warnings again, as they were in 2.69.
(Technically these diagnostics were always errors, in the sense that
they were reported with a call to Autom4te::Channels::error(), but
prior to 2.70, error() calls made by autoreconf did not cause
autoreconf to exit unsuccessfully, due to an unrelated bug. So people
came to depend on these diagnostics not being fatal.)
---
bin/autoreconf.in | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index bb9f316d..9855efbe 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -644,14 +644,18 @@ sub autoreconf_current_directory ($)
}
}
- # Gettext consistency checks...
- error($configure_ac,
- "AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION"
- . " or AM_GNU_GETTEXT_REQUIRE_VERSION")
+ # Gettext consistency checks.
+ # Some projects intentionally don't call AM_GNU_GETTEXT_(REQUIRE_)VERSION
+ # because they have all of the gettext infrastructure checked into version
+ # control and they want us to _not_ run autopoint. Therefore, these
+ # diagnostics are only warnings.
+ msg('syntax', $configure_ac,
+ "AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION"
+ . " or AM_GNU_GETTEXT_REQUIRE_VERSION")
if $uses_gettext_via_traces && ! $uses_gettext;
- error($configure_ac,
- "AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION is used,"
- . " but not AM_GNU_GETTEXT")
+ msg('syntax', $configure_ac,
+ "AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION is used,"
+ . " but not AM_GNU_GETTEXT")
if $uses_gettext && ! $uses_gettext_via_traces;
--
cgit v1.2.1

View File

@ -1,31 +0,0 @@
From 05972f49ee632cd98057a3caf82ebfb9574846da Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Tue, 8 Dec 2020 21:35:45 -0500
Subject: _AC_PROG_CC_C99: fix typo (#110396)
_AC_PROG_CC_C99 was using the wrong test program.
Fixes #110396, reported anonymously.
* lib/autoconf/c.m4 (_AC_PROG_CC_C99): Use the C99 test program, not
the C89 test program.
---
lib/autoconf/c.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index fe217cad..601c2df4 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -1559,7 +1559,7 @@ dnl SVR4 -Xc -D__EXTENSIONS__
# option to output variable CC to make it so.
AC_DEFUN([_AC_PROG_CC_C99],
[AC_REQUIRE([_AC_C_C99_TEST_PROGRAM])]dnl
-[_AC_C_STD_TRY([c99], [ac_c_conftest_c89_program],
+[_AC_C_STD_TRY([c99], [ac_c_conftest_c99_program],
dnl Try
dnl GCC -std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999)
dnl IBM XL C -qlanglvl=extc1x (V12.1; does not pass C11 test)
--
cgit v1.2.1

File diff suppressed because it is too large Load Diff