forked from pool/autoconf
- add autom4te-always-update-output-file.patch to fix testsuite
failures - add autom4te-always-update-output-file.patch to fix testsuite failures OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=49
This commit is contained in:
parent
a63372cebc
commit
da56b3f7cb
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 16 18:47:23 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- add autom4te-always-update-output-file.patch to fix testsuite
|
||||
failures
|
||||
- handle-gettext-alone.patch: support GNU_GETTEXT alone being called
|
||||
again
|
||||
- add prog-c99-fix-typo.patch: fix typo in C99 detection
|
||||
- add restore-compatibility-gnu11.patch: restore compatibility in GNU11
|
||||
mode
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 13 18:52:47 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 16 18:47:23 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- add autom4te-always-update-output-file.patch to fix testsuite
|
||||
failures
|
||||
- handle-gettext-alone.patch: support GNU_GETTEXT alone being called
|
||||
again
|
||||
- add prog-c99-fix-typo.patch: fix typo in C99 detection
|
||||
- add restore-compatibility-gnu11.patch: restore compatibility in GNU11
|
||||
mode
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 13 18:52:47 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
|
@ -28,6 +28,12 @@ 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
|
||||
@ -55,6 +61,9 @@ only required for the generation of the scripts, not their use.
|
||||
%setup -q -n autoconf-%{version}
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
@ -3,6 +3,11 @@ Sat Jan 16 18:47:23 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- add autom4te-always-update-output-file.patch to fix testsuite
|
||||
failures
|
||||
- handle-gettext-alone.patch: support GNU_GETTEXT alone being called
|
||||
again
|
||||
- add prog-c99-fix-typo.patch: fix typo in C99 detection
|
||||
- add restore-compatibility-gnu11.patch: restore compatibility in GNU11
|
||||
mode
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 13 18:52:47 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
@ -28,6 +28,12 @@ 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
|
||||
@ -55,6 +61,9 @@ only required for the generation of the scripts, not their use.
|
||||
%setup -q -n autoconf-%{version}
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
58
handle-gettext-alone.patch
Normal file
58
handle-gettext-alone.patch
Normal file
@ -0,0 +1,58 @@
|
||||
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
|
||||
|
31
prog-c99-fix-typo.patch
Normal file
31
prog-c99-fix-typo.patch
Normal file
@ -0,0 +1,31 @@
|
||||
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
|
||||
|
1913
restore-compatibility-gnu11.patch
Normal file
1913
restore-compatibility-gnu11.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user