* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2017-03-23 14:23 Fabian Groffen
0 siblings, 0 replies; 15+ messages in thread
From: Fabian Groffen @ 2017-03-23 14:23 UTC (permalink / raw
To: gentoo-commits
commit: ad2f301de2a6b184295c645c1142c3bdf10112a3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 14:23:23 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 14:23:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2f301d
sys-devel/autoconf: add Prefix keywords and Darwin patch
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-devel/autoconf/autoconf-2.13.ebuild | 4 ++--
sys-devel/autoconf/autoconf-2.69-r2.ebuild | 13 ++++++++++---
sys-devel/autoconf/files/autoconf-2.61-darwin.patch | 11 +++++++++++
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild
index 60f3ef570bb..7cc31570e93 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="userland_BSD"
DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autoconf/autoconf-2.69-r2.ebuild b/sys-devel/autoconf/autoconf-2.69-r2.ebuild
index 593e8a0454d..fd7f617cb4a 100644
--- a/sys-devel/autoconf/autoconf-2.69-r2.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
+inherit eutils
+
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
http://git.savannah.gnu.org/r/${PN}.git"
@@ -12,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Used to create autoconfiguration files"
@@ -33,6 +35,11 @@ PDEPEND="emacs? ( app-emacs/autoconf-mode )"
if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
source "${FILESDIR}"/eblits/main.eblit || die
fi
-src_prepare() { eblit-run src_prepare ; }
+src_prepare() {
+ # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+ [[ ${CHOST} == *-darwin* ]] && \
+ PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+ eblit-run src_prepare
+}
src_configure() { eblit-run src_configure ; }
src_install() { eblit-run src_install ; }
diff --git a/sys-devel/autoconf/files/autoconf-2.61-darwin.patch b/sys-devel/autoconf/files/autoconf-2.61-darwin.patch
new file mode 100644
index 00000000000..2ac2be361db
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.61-darwin.patch
@@ -0,0 +1,11 @@
+--- bin/autoreconf.in
++++ bin/autoreconf.in
+@@ -110,7 +110,7 @@
+ my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
+ my $automake = $ENV{'AUTOMAKE'} || 'automake';
+ my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
+-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
++my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize';
+ my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint';
+
+ # --install -- as --add-missing in other tools.
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2017-05-13 9:29 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2017-05-13 9:29 UTC (permalink / raw
To: gentoo-commits
commit: f10f1764a0d0adc2265731ca20e4bf58fe9f3950
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Wed May 10 18:16:46 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat May 13 09:29:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10f1764
sys-devel/autoconf: Fix libtool test
Gentoo-Bug: https://bugs.gentoo.org/584144
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4598
sys-devel/autoconf/autoconf-2.69-r3.ebuild | 5 +++-
.../files/autoconf-2.69-fix-libtool-test.patch | 31 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/sys-devel/autoconf/autoconf-2.69-r3.ebuild b/sys-devel/autoconf/autoconf-2.69-r3.ebuild
index 37354a400d9..54b5079415c 100644
--- a/sys-devel/autoconf/autoconf-2.69-r3.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r3.ebuild
@@ -36,6 +36,9 @@ src_prepare() {
# usr/bin/libtool is provided by binutils-apple, need gnu libtool
[[ ${CHOST} == *-darwin* ]] && \
PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
- PATCHES+=( "${FILESDIR}"/${PN}-2.69-perl-5.26.patch )
+ PATCHES+=(
+ "${FILESDIR}"/${PN}-2.69-perl-5.26.patch
+ "${FILESDIR}"/${P}-fix-libtool-test.patch
+ )
toolchain-autoconf_src_prepare
}
diff --git a/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch b/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch
new file mode 100644
index 00000000000..e75eba62160
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch
@@ -0,0 +1,31 @@
+From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001
+From: "Gary V. Vaughan" <gary@gnu.org>
+Date: Mon, 3 Nov 2014 07:25:03 +0100
+Subject: tests: avoid spurious test failure with libtool 2.4.3
+
+Based on a report by Bruce Dubbs.
+
+* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the
+older `quote'.
+
+Signed-off-by: Eric Blake <eblake@redhat.com>
+---
+ tests/foreign.at | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/foreign.at b/tests/foreign.at
+index a9dc33c..d4702cd 100644
+--- a/tests/foreign.at
++++ b/tests/foreign.at
+@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore])
+ # Make sure at-path contains something valid, and let the test suite
+ # display it when verbose. And fail, skipping would too easily hide
+ # problems.
+-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
+ AT_CHECK([test -f "`sed -n 1p stdout`"])
+
+ # Older libtoolize installed everything but install-sh...
+--
+cgit v1.0-41-gc330
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2018-01-04 9:35 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2018-01-04 9:35 UTC (permalink / raw
To: gentoo-commits
commit: 918e6be64b2778a8863deebec11d62b0ef377d50
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 09:28:19 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 09:35:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918e6be6
sys-devel/autoconf: Removed masked versions.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-devel/autoconf/Manifest | 7 -
sys-devel/autoconf/autoconf-2.59-r7.ebuild | 25 ---
sys-devel/autoconf/autoconf-2.61-r2.ebuild | 31 ---
sys-devel/autoconf/autoconf-2.62-r1.ebuild | 27 ---
sys-devel/autoconf/autoconf-2.63-r1.ebuild | 25 ---
sys-devel/autoconf/autoconf-2.65-r1.ebuild | 25 ---
sys-devel/autoconf/autoconf-2.67.ebuild | 21 --
sys-devel/autoconf/autoconf-2.68.ebuild | 21 --
.../autoconf/files/autoconf-2.59-more-quotes.patch | 34 ----
.../autoconf/files/autoconf-2.61-GETMNTENT.patch | 23 ---
.../autoconf/files/autoconf-2.62-at-keywords.patch | 81 --------
.../files/autoconf-2.62-fix-multiline-string.patch | 30 ---
.../autoconf-2.62-revert-AC_C_BIGENDIAN.patch | 214 ---------------------
sys-devel/autoconf/files/autoconf-2.63-sh.patch | 32 ---
.../files/autoconf-2.65-AC_TYPE_INT_T.patch | 49 -----
15 files changed, 645 deletions(-)
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 5239b1e09ee..79a4bbc53c1 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,10 +1,3 @@
DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
-DIST autoconf-2.59.tar.bz2 925073 BLAKE2B 32d006ec4e4cf5f8011560ef480dc2752321e6ddff2bceff282329c4c2161a76900bc6118c05a1087907f87fb905a46acec6be2a8035d3cb5ff9fb8057dc911f SHA512 0f57e57b94ef78d59e68476746e78de9c8d0c07bcfdbdb850c2e68b59cdbef7e6256a073d1ae8965abd30611f22c1dc451ecdf67aff43102f73ec118c51ab4d6
-DIST autoconf-2.61.tar.bz2 1042439 BLAKE2B 9c7d35c18df684bb539539ab1f1b28d4fbef382a01f769cb765fda932320d83760b962b3d3e9b0e4e9bf39f65aa3731fca9638e76adfcb0dc2ab1d3d7b228bf7 SHA512 f534c7dbc10fc871cc99b1cb68bd7f19d888677d9e2af47e904e91fe90420c20e7a270da2681da82e249ffb46c92165202cc73e125a9b14abd604458731b0026
-DIST autoconf-2.62.tar.bz2 1165951 BLAKE2B a4487cdcda6a8f9ed6cf3c182a7bbe1567d74739646004013df6545c5b7ede7ecd76dc4dc45da87ae4dbbaacf140d52fac089912ef6b9f2c3b35f53585b4fabe SHA512 98a2d903e8c43088ac60b880f58d7c35c547824c277dbeb14c48f846e40f29546c20e942f99127ffdc6f6607c334a6054328f20a9a2962972cc80570665ee7d7
-DIST autoconf-2.63.tar.bz2 1195259 BLAKE2B 2db806f45f01f33e7941e49e2f48d8f0b659b0b9cec0c1a7d5fff4cf6545734b6836bbc60ca39c664ed38e212261cb90a07a2c40f0095807af6fde813f2b9a85 SHA512 bd47527a1f6558953d21ac1d7a36d490d057a78cd612f82b6f31aa73f9c42f4a2d736a7d4e49d91df268bffa5a418d222c53e741bffc2c8843fe3b7ed37e09d6
DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
-DIST autoconf-2.65.tar.xz 1132092 BLAKE2B 13f9d9d497013cf85b5aa7a7be688d93f8acdd7213c8490efd7b421e5e3d4730ad9c70920e3cb92a56ba1085b5f04de9857e59ae35767efbab97e518c8c685c5 SHA512 23473cde36ad02a9474286a144c751b222d7aecf8b271b49e6dae25706c96d5533c8d840d522ecf11df8c437961a2ac00aa050c929d5e06b381acf1bc34f2c4c
-DIST autoconf-2.67.tar.xz 1158000 BLAKE2B 69a85e473fe2895f397b3370623ccde1b461627026314c336b0350b0bc5d843ae381c4df2a84e29e9f582070d4e9088c3c2ee5c7b0e7745dabd065cf1622c41c SHA512 b9021a137da42512f6c4ce907b560ad54e27491083ce686039c32dca2602f3cb354d9e7d7493d6d531a0aa5766ff25e0d86aea6e8f61a79d93acf3ff6b56de80
-DIST autoconf-2.68.tar.xz 1167804 BLAKE2B 557fcabec4bf5332a443b2454fefc1a4abb8a22fc36b6f9bf91606c510ebefe8a13021676e6fe2205c56349d96d2cbb3f2d252639e5445639361360815b8ff98 SHA512 fd41b2d75a89bcc67f2cb0a3b335ca0d5e8f6d3f4ae844fea21c80c5ff7234efe8c299491e89d1d1124b0d4ec3072a21cf707e14b5ef186f1ab2d09f0fefa979
DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
diff --git a/sys-devel/autoconf/autoconf-2.59-r7.ebuild b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
deleted file mode 100644
index 7eade818351..00000000000
--- a/sys-devel/autoconf/autoconf-2.59-r7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="=sys-devel/m4-1.4*
- dev-lang/perl"
-RDEPEND="${DEPEND}
- !~sys-devel/${P}:2.5
- >=sys-devel/autoconf-wrapper-13"
-
-PATCHES=(
- "${FILESDIR}"/${P}-more-quotes.patch
-)
diff --git a/sys-devel/autoconf/autoconf-2.61-r2.ebuild b/sys-devel/autoconf/autoconf-2.61-r2.ebuild
deleted file mode 100644
index e1fedced320..00000000000
--- a/sys-devel/autoconf/autoconf-2.61-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-devel/m4-1.4.6
- dev-lang/perl"
-RDEPEND="${DEPEND}
- !~sys-devel/${P}:2.5
- >=sys-devel/autoconf-wrapper-13"
-
-PATCHES=(
- "${FILESDIR}"/${P}-GETMNTENT.patch
-)
-
-src_compile() {
- # From configure output:
- # Parallel builds via `make -jN' do not work.
- emake -j1
-}
diff --git a/sys-devel/autoconf/autoconf-2.62-r1.ebuild b/sys-devel/autoconf/autoconf-2.62-r1.ebuild
deleted file mode 100644
index 574a0af6ce7..00000000000
--- a/sys-devel/autoconf/autoconf-2.62-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-devel/m4-1.4.6
- dev-lang/perl"
-RDEPEND="${DEPEND}
- !~sys-devel/${P}:2.5
- >=sys-devel/autoconf-wrapper-13"
-
-PATCHES=(
- "${FILESDIR}"/${P}-revert-AC_C_BIGENDIAN.patch #228825
- "${FILESDIR}"/${P}-at-keywords.patch
- "${FILESDIR}"/${P}-fix-multiline-string.patch #217976
-)
diff --git a/sys-devel/autoconf/autoconf-2.63-r1.ebuild b/sys-devel/autoconf/autoconf-2.63-r1.ebuild
deleted file mode 100644
index 0df070c9876..00000000000
--- a/sys-devel/autoconf/autoconf-2.63-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-devel/m4-1.4.6
- dev-lang/perl"
-RDEPEND="${DEPEND}
- !~sys-devel/${P}:2.5
- >=sys-devel/autoconf-wrapper-13"
-
-PATCHES=(
- "${FILESDIR}"/${P}-sh.patch #264303
-)
diff --git a/sys-devel/autoconf/autoconf-2.65-r1.ebuild b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
deleted file mode 100644
index 1354433f9d3..00000000000
--- a/sys-devel/autoconf/autoconf-2.65-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-devel/m4-1.4.6
- dev-lang/perl"
-RDEPEND="${DEPEND}
- !~sys-devel/${P}:2.5
- >=sys-devel/autoconf-wrapper-13"
-
-PATCHES=(
- "${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649
-)
diff --git a/sys-devel/autoconf/autoconf-2.67.ebuild b/sys-devel/autoconf/autoconf-2.67.ebuild
deleted file mode 100644
index 4290fee7575..00000000000
--- a/sys-devel/autoconf/autoconf-2.67.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-devel/m4-1.4.6
- dev-lang/perl"
-RDEPEND="${DEPEND}
- !~sys-devel/${P}:2.5
- >=sys-devel/autoconf-wrapper-13"
diff --git a/sys-devel/autoconf/autoconf-2.68.ebuild b/sys-devel/autoconf/autoconf-2.68.ebuild
deleted file mode 100644
index 4290fee7575..00000000000
--- a/sys-devel/autoconf/autoconf-2.68.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-devel/m4-1.4.6
- dev-lang/perl"
-RDEPEND="${DEPEND}
- !~sys-devel/${P}:2.5
- >=sys-devel/autoconf-wrapper-13"
diff --git a/sys-devel/autoconf/files/autoconf-2.59-more-quotes.patch b/sys-devel/autoconf/files/autoconf-2.59-more-quotes.patch
deleted file mode 100644
index eb2c8395fa9..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.59-more-quotes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/96882
-
-date: 2005/06/23 20:09:27; author: eggert; state: Exp; lines: +29 -34
-Fix some more shell quoting problems. Prompted by a bug report
-from Justace Clutter.
-* lib/autoconf/general.m4 (_AC_INIT_SRCDIR): Allow special
-characters in $ac_unique_file.
-
---- lib/autoconf/general.m4
-+++ lib/autoconf/general.m4
-@@ -476,20 +476,20 @@
- # Try the directory containing this script, then its parent.
- ac_confdir=`AS_DIRNAME(["$[0]"])`
- srcdir=$ac_confdir
-- if test ! -r $srcdir/$ac_unique_file; then
-+ if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
-+if test ! -r "$srcdir/$ac_unique_file"; then
- if test "$ac_srcdir_defaulted" = yes; then
- AC_MSG_ERROR([cannot find sources ($ac_unique_file) in $ac_confdir or ..])
- else
- AC_MSG_ERROR([cannot find sources ($ac_unique_file) in $srcdir])
- fi
- fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
- AC_MSG_ERROR([sources are in $srcdir, but `cd $srcdir' does not work])
- dnl Double slashes in pathnames in object file debugging info
- dnl mess up M-x gdb in Emacs.
diff --git a/sys-devel/autoconf/files/autoconf-2.61-GETMNTENT.patch b/sys-devel/autoconf/files/autoconf-2.61-GETMNTENT.patch
deleted file mode 100644
index 7cdc425e039..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.61-GETMNTENT.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sat, 16 Dec 2006 05:38:41 +0000 (+0000)
-Subject: * lib/autoconf/functions.m4 (AC_FUNC_GETMNTENT):
-X-Git-Tag: v2.62~386
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff_plain;h=a152d401584cd901f7295647af0382948369de79
-
-* lib/autoconf/functions.m4 (AC_FUNC_GETMNTENT):
-Define HAVE_GETMNTENT to 1, not to the empty string.
-Problem originally reported by Jochen Friedrich in
-<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=403243>.
----
-
---- a/lib/autoconf/functions.m4
-+++ b/lib/autoconf/functions.m4
-@@ -798,7 +798,7 @@ AC_DEFUN([AC_FUNC_GETMNTENT],
- # -lseq on Dynix/PTX, -lgen on Unixware.
- AC_SEARCH_LIBS(getmntent, [sun seq gen],
- [ac_cv_func_getmntent=yes
-- AC_DEFINE([HAVE_GETMNTENT], [],
-+ AC_DEFINE([HAVE_GETMNTENT], 1,
- [Define to 1 if you have the `getmntent' function.])],
- [ac_cv_func_getmntent=no])
- ])
diff --git a/sys-devel/autoconf/files/autoconf-2.62-at-keywords.patch b/sys-devel/autoconf/files/autoconf-2.62-at-keywords.patch
deleted file mode 100644
index 04cd1807b8a..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.62-at-keywords.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 3ac7ceb0c2dfd023e0e9e944da6825b6bd676568
-Author: Eric Blake <ebb9@byu.net>
-Date: Thu Jun 5 15:18:11 2008 -0600
-
- Fix regression in AT_KEYWORDS([Macro]), from 2007-10-18.
-
- * lib/autotest/general.m4 (AT_KEYWORDS): Expand argument prior to
- converting it to lower case.
- * tests/autotest.at (Keywords and ranges): Test this.
- * NEWS: Document the fix.
- * THANKS: Update.
- Reported by Karsten Hopp.
-
- Signed-off-by: Eric Blake <ebb9@byu.net>
-
-diff --git a/NEWS b/NEWS
-index 183d4f1..8b866ad 100644
---- a/NEWS
-+++ b/NEWS
-@@ -9,6 +9,10 @@ GNU Autoconf NEWS - User visible changes.
- ** Two new quadrigraphs have been introduced: @{:@ for (, and @:}@ for ),
- allowing the output of unbalanced parantheses in more contexts.
-
-+** AT_KEYWORDS once again performs expansion on its argument, such that
-+ AT_KEYWORDS([m4_if([$1], [], [default])]) no longer complains about
-+ the possibly unexpanded m4_if [regression introduced in 2.62].
-+
- \f
- * Major changes in Autoconf 2.62 (2008-04-05) [stable]
- Released by Eric Blake, based on git versions 2.61a.*.
-diff --git a/THANKS b/THANKS
-index 5ec8921..224cdea 100644
---- a/THANKS
-+++ b/THANKS
-@@ -177,6 +177,7 @@ Justace Clutter ?
- Jörn Rennecke amylaar@cygnus.co.uk
- Karl Berry karl@cs.umb.edu
- Karl Heuer kwzh@gnu.org
-+Karsten Hopp karsten@redhat.com
- Kate Hedstrom ?
- Kathryn Hargreaves kathryn@deas.harvard.edu
- Kaveh R. Ghazi ghazi@caip.rutgers.edu
-diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
-index 88d10a3..993dd9f 100644
---- a/lib/autotest/general.m4
-+++ b/lib/autotest/general.m4
-@@ -1476,9 +1476,10 @@ m4_case([$1],
- # AT_KEYWORDS(KEYWORDS)
- # ---------------------
- # Declare a list of keywords associated to the current test group.
--# The list is stored in lower case, since the -k option is case-insensitive.
-+# Since the -k option is case-insensitive, the list is stored in lower case
-+# to avoid duplicates that differ only by case.
- _AT_DEFINE_SETUP([AT_KEYWORDS],
--[m4_append_uniq_w([AT_keywords], m4_tolower([[$1]]))])
-+[m4_append_uniq_w([AT_keywords], m4_tolower(m4_dquote(m4_expand([$1]))))])
-
-
- # AT_CAPTURE_FILE(FILE)
-diff --git a/tests/autotest.at b/tests/autotest.at
-index dc3cfd5..c4c0eda 100644
---- a/tests/autotest.at
-+++ b/tests/autotest.at
-@@ -690,7 +690,7 @@ AT_CHECK(:)
- AT_CLEANUP
- AT_SETUP(both) # 04
- AT_KEYWORDS([key1 key2])
--AT_KEYWORDS([key1])
-+AT_KEYWORDS([m4@&t@_echo([Key1])])
- AT_CHECK(:)
- AT_CLEANUP
- AT_SETUP(test5) # 05
-@@ -713,7 +713,7 @@ AT_CHECK(:)
- AT_CLEANUP
- ]])
- dnl check that AT_KEYWORDS does not duplicate words
--AT_CHECK([grep 'key1.*key1' k], [1])
-+AT_CHECK([grep -i 'key1.*key1' k], [1])
- dnl check that -k requires an argument
- AT_CHECK([$CONFIG_SHELL ./k -k], [1], [], [ignore])
-
diff --git a/sys-devel/autoconf/files/autoconf-2.62-fix-multiline-string.patch b/sys-devel/autoconf/files/autoconf-2.62-fix-multiline-string.patch
deleted file mode 100644
index cfd7b422879..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.62-fix-multiline-string.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-sniped from mandrivia:
-http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/autoconf/current/SOURCES/autoconf-2.62-fix-multiline-string.patch
-
-this may not be the correct fix, but it seems to get the job done until we can
-grab whatever upstream merges
-http://lists.gnu.org/archive/html/bug-autoconf/2008-04/msg00031.html
-
---- autoconf-2.62/lib/autoconf/status.m4
-+++ autoconf-2.62/lib/autoconf/status.m4
-@@ -1360,16 +1360,16 @@ _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- # Files that config.status was made for.
- m4_ifdef([_AC_SEEN_CONFIG(FILES)],
--[config_files="$ac_config_files"
-+[config_files="`echo $ac_config_files`"
- ])dnl
- m4_ifdef([_AC_SEEN_CONFIG(HEADERS)],
--[config_headers="$ac_config_headers"
-+[config_headers="`echo $ac_config_headers`"
- ])dnl
- m4_ifdef([_AC_SEEN_CONFIG(LINKS)],
--[config_links="$ac_config_links"
-+[config_links="`echo $ac_config_links`"
- ])dnl
- m4_ifdef([_AC_SEEN_CONFIG(COMMANDS)],
--[config_commands="$ac_config_commands"
-+[config_commands="`echo $ac_config_commands`"
- ])dnl
-
- _ACEOF
diff --git a/sys-devel/autoconf/files/autoconf-2.62-revert-AC_C_BIGENDIAN.patch b/sys-devel/autoconf/files/autoconf-2.62-revert-AC_C_BIGENDIAN.patch
deleted file mode 100644
index 76db013cac5..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.62-revert-AC_C_BIGENDIAN.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-revert AC_C_BIGENDIAN to the version found in 2.61 since the version in 2.62 is
-known to be broken and the changes that it brings are not critical
-
-http://bugs.gentoo.org/228825
-
---- autoconf-2.62/lib/autoconf/c.m4
-+++ autoconf-2.61/lib/autoconf/c.m4
-@@ -1393,140 +1351,74 @@
- ])# AC_C_CHAR_UNSIGNED
-
-
--# AC_C_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN],
--# [ACTION-IF-UNIVERSAL])
-+# AC_C_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN])
- # -------------------------------------------------------------------------
- AC_DEFUN([AC_C_BIGENDIAN],
--[AH_VERBATIM([WORDS_BIGENDIAN],
--[/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-- significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
--#if defined __BIG_ENDIAN__
--# define WORDS_BIGENDIAN 1
--#elif ! defined __LITTLE_ENDIAN__
--# undef WORDS_BIGENDIAN
--#endif])dnl
-- AC_CACHE_CHECK([whether byte ordering is bigendian], [ac_cv_c_bigendian],
-- [ac_cv_c_bigendian=unknown
-- m4_ifval(m4_ifdef([AH_HEADER], 1)[$4],
-- [# See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
-- AC_COMPILE_IFELSE(
-- [AC_LANG_SOURCE(
-- [[#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
-- neither is defined;
-- #endif
-- typedef int dummy;
-- ]])],
-- [ac_cv_c_bigendian=universal])],
-- [AC_DIAGNOSE([obsolete], [AC_C_BIGENDIAN suggests AC_CONFIG_HEADERS])])
-- if test $ac_cv_c_bigendian = unknown; then
-- # See if sys/param.h defines the BYTE_ORDER macro.
-- AC_COMPILE_IFELSE(
-- [AC_LANG_PROGRAM(
-- [[#include <sys/types.h>
-- #include <sys/param.h>
-- ]],
-- [[#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-- && LITTLE_ENDIAN)
-- bogus endian macros
-- #endif
-- ]])],
-- [# It does; now see whether it defined to BIG_ENDIAN or not.
-- AC_COMPILE_IFELSE(
-- [AC_LANG_PROGRAM(
-- [[#include <sys/types.h>
-- #include <sys/param.h>
-- ]],
-- [[#if BYTE_ORDER != BIG_ENDIAN
-- not big endian
-- #endif
-- ]])],
-- [ac_cv_c_bigendian=yes],
-- [ac_cv_c_bigendian=no])])
-- fi
-- if test $ac_cv_c_bigendian = unknown; then
-- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-- AC_COMPILE_IFELSE(
-- [AC_LANG_PROGRAM(
-- [[#include <limits.h>
-- ]],
-- [[#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-- bogus endian macros
-- #endif
-- ]])],
-- [# It does; now see whether it defined to _BIG_ENDIAN or not.
-- AC_COMPILE_IFELSE(
-- [AC_LANG_PROGRAM(
-- [[#include <limits.h>
-- ]],
-- [[#ifndef _BIG_ENDIAN
-- not big endian
-- #endif
-- ]])],
-- [ac_cv_c_bigendian=yes],
-- [ac_cv_c_bigendian=no])])
-- fi
-- if test $ac_cv_c_bigendian = unknown; then
-- # Compile a test program.
-- AC_RUN_IFELSE(
-- [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-- [[
-- /* Are we little or big endian? From Harbison&Steele. */
-- union
-- {
-- long int l;
-- char c[sizeof (long int)];
-- } u;
-- u.l = 1;
-- return u.c[sizeof (long int) - 1] == 1;
-- ]])],
-- [ac_cv_c_bigendian=no],
-- [ac_cv_c_bigendian=yes],
-- [# Try to guess by grepping values from an object file.
-- AC_COMPILE_IFELSE(
-- [AC_LANG_PROGRAM(
-- [[short int ascii_mm[] =
-- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-- short int ascii_ii[] =
-- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-- int use_ascii (int i) {
-- return ascii_mm[i] + ascii_ii[i];
-- }
-- short int ebcdic_ii[] =
-- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-- short int ebcdic_mm[] =
-- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-- int use_ebcdic (int i) {
-- return ebcdic_mm[i] + ebcdic_ii[i];
-- }
-- extern int foo;
-- ]],
-- [[return use_ascii (foo) == use_ebcdic (foo);]])],
-- [if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-- ac_cv_c_bigendian=yes
-- fi
-- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-- if test "$ac_cv_c_bigendian" = unknown; then
-- ac_cv_c_bigendian=no
-- else
-- # finding both strings is unlikely to happen, but who knows?
-- ac_cv_c_bigendian=unknown
-- fi
-- fi])])
-- fi])
-- case $ac_cv_c_bigendian in #(
-- yes)
-- m4_default([$1],
-- [AC_DEFINE([WORDS_BIGENDIAN], 1)]);; #(
-- no)
-- $2 ;; #(
-- universal)
-- $4 ;; #(
-- *)
-- m4_default([$3],
-- [AC_MSG_ERROR([unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help])]) ;;
-- esac
-+[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
-+[# See if sys/param.h defines the BYTE_ORDER macro.
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
-+#include <sys/param.h>
-+],
-+[#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-+ bogus endian macros
-+#endif
-+])],
-+[# It does; now see whether it defined to BIG_ENDIAN or not.
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
-+#include <sys/param.h>
-+], [#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+#endif
-+])], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=no])],
-+[# It does not; compile a test program.
-+AC_RUN_IFELSE(
-+[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], [[
-+ /* Are we little or big endian? From Harbison&Steele. */
-+ union
-+ {
-+ long int l;
-+ char c[sizeof (long int)];
-+ } u;
-+ u.l = 1;
-+ return u.c[sizeof (long int) - 1] == 1;
-+]])],
-+ [ac_cv_c_bigendian=no],
-+ [ac_cv_c_bigendian=yes],
-+[# try to guess the endianness by grepping values into an object file
-+ ac_cv_c_bigendian=unknown
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-+[[short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }]],
-+[[ _ascii (); _ebcdic (); ]])],
-+[if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-+ ac_cv_c_bigendian=yes
-+fi
-+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+ if test "$ac_cv_c_bigendian" = unknown; then
-+ ac_cv_c_bigendian=no
-+ else
-+ # finding both strings is unlikely to happen, but who knows?
-+ ac_cv_c_bigendian=unknown
-+ fi
-+fi])])])])
-+case $ac_cv_c_bigendian in
-+ yes)
-+ m4_default([$1],
-+ [AC_DEFINE([WORDS_BIGENDIAN], 1,
-+ [Define to 1 if your processor stores words with the most significant
-+ byte first (like Motorola and SPARC, unlike Intel and VAX).])]) ;;
-+ no)
-+ $2 ;;
-+ *)
-+ m4_default([$3],
-+ [AC_MSG_ERROR([unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help])]) ;;
-+esac
- ])# AC_C_BIGENDIAN
-
-
diff --git a/sys-devel/autoconf/files/autoconf-2.63-sh.patch b/sys-devel/autoconf/files/autoconf-2.63-sh.patch
deleted file mode 100644
index 8008b32b602..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.63-sh.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-http://bugs.gentoo.org/264303
-http://lists.gnu.org/archive/html/bug-autoconf/2008-10/msg00040.html
-
-From: Chikama Masaki <masaki.chikama@gmail.com>
-Date: Fri, 24 Oct 2008 01:41:06 +0000 (-0600)
-Subject: For gfortran on sh, ignore -little.
-X-Git-Tag: v2.63b~206
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff_plain;h=3f38aad
-
-For gfortran on sh, ignore -little.
-
-* lib/autoconf/fortran.m4 (_AC_FC_LIBRARY_LDFLAGS): Add -little to
-list of ignored arguments.
-* THANKS: Update.
-
-Signed-off-by: Eric Blake <ebb9@byu.net>
----
-
-diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
-index 20d9e0c..ad0c2ee 100644
---- a/lib/autoconf/fortran.m4
-+++ b/lib/autoconf/fortran.m4
-@@ -686,7 +686,8 @@ while test $[@%:@] != 1; do
- [_AC_LINKER_OPTION([$ac_arg], ac_cv_[]_AC_LANG_ABBREV[]_libs)])
- ;;
- # Ignore these flags.
-- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
-+ -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \
-+ |-LANG:=* | -LIST:* | -LNO:*)
- ;;
- -lkernel32)
- test x"$CYGWIN" != xyes && ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_arg"
diff --git a/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch b/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch
deleted file mode 100644
index cc81672e427..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/324649
-http://lists.gnu.org/archive/html/bug-autoconf/2009-12/msg00016.html
-
-From 83ee5bc460a1083ab29fd9d3a3044cbaefad6ac6 Mon Sep 17 00:00:00 2001
-From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-Date: Wed, 9 Dec 2009 07:20:16 +0100
-Subject: [PATCH] Fix 2.64 AC_TYPE_INT*_T macro body text regression.
-
-* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
-definition to prologue section, to avoid syntax error.
-* NEWS, THANKS: Update.
-Report by Pierre Ynard.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
----
- ChangeLog | 8 ++++++++
- NEWS | 3 +++
- THANKS | 1 +
- lib/autoconf/types.m4 | 12 ++++++------
- 4 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
-index 7a73fc2..3829c4c 100644
---- a/lib/autoconf/types.m4
-+++ b/lib/autoconf/types.m4
-@@ -635,14 +635,14 @@ m4_define([_AC_TYPE_INT_BODY],
- 'long long int' 'short int' 'signed char'; do
- AC_COMPILE_IFELSE(
- [AC_LANG_BOOL_COMPILE_TRY(
-- [AC_INCLUDES_DEFAULT],
-- [enum { N = $[]2 / 2 - 1 };
-- 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
-+ [AC_INCLUDES_DEFAULT
-+ enum { N = $[]2 / 2 - 1 };],
-+ [0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
- [AC_COMPILE_IFELSE(
- [AC_LANG_BOOL_COMPILE_TRY(
-- [AC_INCLUDES_DEFAULT],
-- [enum { N = $[]2 / 2 - 1 };
-- ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
-+ [AC_INCLUDES_DEFAULT
-+ enum { N = $[]2 / 2 - 1 };],
-+ [($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
- < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2)])],
- [],
- [AS_CASE([$ac_type], [int$[]2_t],
---
-1.7.1
-
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2018-01-18 9:40 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2018-01-18 9:40 UTC (permalink / raw
To: gentoo-commits
commit: d5a68641a8506b6538a2f839a2b5b7b1970f89f6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 23:31:19 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 09:40:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a68641
sys-devel/autoconf: Port 2.13 to EAPI 6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-devel/autoconf/autoconf-2.13.ebuild | 7 ++++---
sys-devel/autoconf/files/autoconf-2.13-destdir.patch | 4 ++--
sys-devel/autoconf/files/autoconf-2.13-gentoo.patch | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild
index 4a48b2723e2..8f10539884d 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
inherit toolchain-autoconf
@@ -27,7 +27,8 @@ PATCHES=(
)
src_configure() {
- touch configure # make sure configure is newer than configure.in
+ # make sure configure is newer than configure.in
+ touch configure || die
# need to include --exec-prefix and --bindir or our
# DESTDIR patch will trigger sandbox hate :(
diff --git a/sys-devel/autoconf/files/autoconf-2.13-destdir.patch b/sys-devel/autoconf/files/autoconf-2.13-destdir.patch
index 858b8bcc1f7..47605af5f59 100644
--- a/sys-devel/autoconf/files/autoconf-2.13-destdir.patch
+++ b/sys-devel/autoconf/files/autoconf-2.13-destdir.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2004-10-20 16:44:54.949117496 -0400
-+++ Makefile.in 2004-10-20 16:45:39.999268832 -0400
+--- a/Makefile.in
++++ b/Makefile.in
@@ -41,18 +41,18 @@
transform=@program_transform_name@
diff --git a/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch b/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch
index 8e40d0cae04..44f09cba92f 100644
--- a/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch
+++ b/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.orig Wed Feb 28 20:51:53 2001
-+++ configure Wed Feb 28 20:52:03 2001
+--- a/configure
++++ b/configure
@@ -654,12 +654,10 @@
echo "$ac_t""no" 1>&6
fi
@@ -16,8 +16,8 @@
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then
---- configure.orig Wed Feb 28 20:53:24 2001
-+++ configure.in Wed Feb 28 20:53:28 2001
+--- a/configure.in
++++ b/configure.in
@@ -14,12 +14,10 @@
AC_PATH_PROG(PERL, perl, no)
AC_SUBST(PERL)dnl
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2020-08-29 14:38 Thomas Deutschmann
0 siblings, 0 replies; 15+ messages in thread
From: Thomas Deutschmann @ 2020-08-29 14:38 UTC (permalink / raw
To: gentoo-commits
commit: fef54b9ccadd995fa3af6c1446ebc9aa678075f4
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 14:38:09 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 14:38:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef54b9c
sys-devel/autoconf: make tests compatible with bash-5
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-devel/autoconf/autoconf-2.69-r5.ebuild | 1 +
...autoconf-2.69-make-tests-bash5-compatible.patch | 63 ++++++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index 914d3c007fa..a1b71fdccd3 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
"${FILESDIR}"/${P}-fix-libtool-test.patch
"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
+ "${FILESDIR}"/${P}-make-tests-bash5-compatible.patch
"${WORKDIR}"/patches/${P}-runstatedir.patch
"${WORKDIR}"/patches/${P}-texinfo.patch
diff --git a/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch b/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch
new file mode 100644
index 00000000000..1afcec15bb4
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch
@@ -0,0 +1,63 @@
+From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odubaj@redhat.com>
+Date: Wed, 28 Aug 2019 07:39:50 +0200
+Subject: Port tests to Bash 5
+
+* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP):
+Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when
+comparing variable space dumps.
+(AT_CONFIG_CMP): Also ignore LINENO.
+* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'.
+---
+ tests/local.at | 5 ++++-
+ tests/m4sh.at | 4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tests/local.at b/tests/local.at
+index a22958c0..852be285 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then
+ [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC],
+ [GREP|[EF]GREP|SED],
+ [[_@]|.[*#?$].],
+- [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
++ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
+ $act_file ||
+ test $? -eq 1 || echo failed >&2
+ ) 2>stderr-$act_file |
+@@ -382,6 +382,9 @@ do
+ /'\'\\\$\''=/ d
+ /^argv=/ d
+ /^ARGC=/ d
++ /^BASH_ARGC=/ d
++ /^BASH_ARGV=/ d
++ /^LINENO=/ d
+ ' $act_file >at_config_vars-$act_file
+ done
+ AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl
+diff --git a/tests/m4sh.at b/tests/m4sh.at
+index e9d70b02..cbdfcb62 100644
+--- a/tests/m4sh.at
++++ b/tests/m4sh.at
+@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1])
+ # `_oline_', once processed and ran, produces our reference.
+ # We check that we find ourselves by looking at a string which is
+ # available only in the original script: `_oline_'.
+-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__])
++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__])
+ AT_CHECK([./reference], 0, [stdout])
+
+ # The reference:
+@@ -264,7 +264,7 @@ mv stdout expout
+ # Be sure to be out of the PATH.
+ AT_CHECK([mkdir test || exit 77])
+
+-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO])
++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO])
+ AT_CHECK([./test/test-1], 0, [expout])
+ AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)],
+ 0, [expout])
+--
+cgit v1.2.1
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2020-10-17 20:00 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2020-10-17 20:00 UTC (permalink / raw
To: gentoo-commits
commit: c95e99d3956c8d0f6816937107fb0cfeae12366e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 19:59:58 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 20:00:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95e99d3
sys-devel/autoconf: Revbump to improve AC_INIT arg quoting
Thanks-to: Michael Orlitzky <mjo <AT> gentoo.org>
Bug: https://bugs.gentoo.org/732648
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
..._beta2.ebuild => autoconf-2.70_beta2-r1.ebuild} | 4 +
...oconf-2.70_beta2-AC_INIT_argument_quoting.patch | 573 +++++++++++++++++++++
2 files changed, 577 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.70_beta2.ebuild b/sys-devel/autoconf/autoconf-2.70_beta2-r1.ebuild
similarity index 96%
rename from sys-devel/autoconf/autoconf-2.70_beta2.ebuild
rename to sys-devel/autoconf/autoconf-2.70_beta2-r1.ebuild
index 340c2601642..f5729eca99d 100644
--- a/sys-devel/autoconf/autoconf-2.70_beta2.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70_beta2-r1.ebuild
@@ -33,6 +33,10 @@ RDEPEND="${BDEPEND}
[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+PATCHES=(
+ "${FILESDIR}/${P}-AC_INIT_argument_quoting.patch"
+)
+
src_prepare() {
# usr/bin/libtool is provided by binutils-apple, need gnu libtool
if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta2-AC_INIT_argument_quoting.patch b/sys-devel/autoconf/files/autoconf-2.70_beta2-AC_INIT_argument_quoting.patch
new file mode 100644
index 00000000000..8a308c44396
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.70_beta2-AC_INIT_argument_quoting.patch
@@ -0,0 +1,573 @@
+From 8a4571772a5aadc7a005eb288f66ed52b5f52eef Mon Sep 17 00:00:00 2001
+From: Zack Weinberg <zackw@panix.com>
+Date: Wed, 14 Oct 2020 18:03:21 -0400
+Subject: [PATCH 1/1] improvements to AC_INIT argument quoting
+
+---
+ doc/autoconf.texi | 33 ++++---
+ lib/autoconf/general.m4 | 149 +++++++++++++++-----------------
+ lib/autoconf/status.m4 | 29 ++++---
+ tests/base.at | 184 +++++++++++++++++++++++++++++++++++++---
+ 4 files changed, 279 insertions(+), 116 deletions(-)
+
+diff --git a/doc/autoconf.texi b/doc/autoconf.texi
+index 9a52fbdb..a89f1469 100644
+--- a/doc/autoconf.texi
++++ b/doc/autoconf.texi
+@@ -1876,21 +1876,24 @@ distribution tar ball names (e.g., @samp{autoconf}). It defaults to
+ other than alphanumerics and underscores are changed to @samp{-}. If
+ provided, @var{url} should be the home page for the package.
+
+-All the arguments of @code{AC_INIT} must be static, i.e., there should not
+-be any shell computation, quotes, or newlines, but they can be computed
+-by M4. This is because the package information strings are expanded at
+-M4 time into several contexts, and must give the same text at shell time
+-whether used in single-quoted strings, double-quoted strings, quoted
+-here-documents, or unquoted here-documents. It is permissible to use
+-@code{m4_esyscmd} or @code{m4_esyscmd_s} for computing a version string
+-that changes with every commit to a version control system (in fact,
+-Autoconf does just that, for all builds of the development tree made
+-between releases).
++Leading and trailing whitespace is stripped from all the arguments to
++@code{AC_INIT}, and interior whitespace is collapsed to a single space.
++
++The arguments to @code{AC_INIT} may be computed by M4, when
++@command{autoconf} is run. For instance, it is fine for the
++@var{version} argument to be an invocation of @code{m4_esyscmd} that
++runs a command that determines the package's version from information
++stored in the package's version control system. However, they may not
++be computed by the shell, when @command{configure} is run; if they
++contain any construct that would cause computation by the shell,
++Autoconf will issue an error. This restriction is because the arguments
++to AC_INIT are written into @file{configure} several times, in different
++places, only some of which are subject to shell variable and command
++substitution.
+
+ The @var{tarname} argument is used to construct filenames.
+-In addition to being static, it should not contain wildcard
+-characters, white space, or anything else that could be troublesome
+-as part of a file or directory name.
++It should not contain wildcard characters, white space, or anything else
++that could be troublesome as part of a file or directory name.
+
+ The following M4 macros (e.g., @code{AC_PACKAGE_NAME}), output variables
+ (e.g., @code{PACKAGE_NAME}), and preprocessor symbols (e.g.,
+@@ -1947,6 +1950,10 @@ of updating @samp{$@@} and @samp{$*}. However, we suggest that you use
+ standard macros like @code{AC_ARG_ENABLE} instead of attempting to
+ implement your own option processing. @xref{Site Configuration}.
+
++If you use the @code{AC_PACKAGE} M4 macros, beware that they may contain
++characters that are significant to M4. In almost all cases, you should
++refer to them using @code{m4_defn}. @xref{Programming in M4sugar}.
++
+ @node Versioning
+ @section Dealing with Autoconf versions
+ @cindex Autoconf version
+diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
+index eaa1d91b..5955b672 100644
+--- a/lib/autoconf/general.m4
++++ b/lib/autoconf/general.m4
+@@ -230,56 +230,47 @@ m4_define([_AC_INIT_LITERAL],
+
+ # _AC_INIT_PACKAGE(PACKAGE-NAME, VERSION, BUG-REPORT, [TARNAME], [URL])
+ # ---------------------------------------------------------------------
++# Set the values of AC_PACKAGE_{NAME,VERSION,STRING,BUGREPORT,TARNAME,URL}
++# from the arguments.
+ m4_define([_AC_INIT_PACKAGE],
+-[m4_pushdef([_ac_init_NAME], m4_normalize([$1]))
+-m4_pushdef([_ac_init_VERSION], m4_normalize([$2]))
+-m4_pushdef([_ac_init_BUGREPORT], m4_normalize([$3]))
+-m4_pushdef([_ac_init_TARNAME], m4_normalize([$4]))
+-m4_pushdef([_ac_init_URL], m4_normalize([$5]))
+-# NAME, VERSION, BUGREPORT, and URL should all be safe for use in shell
+-# strings of all kinds.
+-_AC_INIT_LITERAL(m4_defn([_ac_init_NAME]))
+-_AC_INIT_LITERAL(m4_defn([_ac_init_VERSION]))
+-_AC_INIT_LITERAL(m4_defn([_ac_init_BUGREPORT]))
+-_AC_INIT_LITERAL(m4_defn([_ac_init_URL]))
++[_AC_INIT_PACKAGE_N(m4_normalize([$1]), m4_normalize([$2]), m4_normalize([$3]),
++ m4_normalize([$4]), m4_normalize([$5]))])
++
++# _AC_INIT_PACKAGE_N(PACKAGE-NAME, VERSION, BUG-REPORT, [TARNAME], [URL])
++# -----------------------------------------------------------------------
++# Subroutine of _AC_INIT_PACKAGE.
++m4_define([_AC_INIT_PACKAGE_N],
++[# PACKAGE-NAME, VERSION, BUGREPORT, and URL should all be safe for use
++# in shell strings of all kinds.
++_AC_INIT_LITERAL([$1])
++_AC_INIT_LITERAL([$2])
++_AC_INIT_LITERAL([$3])
++_AC_INIT_LITERAL([$5])
+ # TARNAME is even more constrained: it should not contain any shell
+ # metacharacters or whitespace, because it is used to construct
+ # filenames.
+-AS_LITERAL_WORD_IF(m4_defn([_ac_init_TARNAME]), [],
++AS_LITERAL_WORD_IF([$4], [],
+ [m4_warn([syntax],
+- [AC_INIT: unsafe as a filename: "]m4_defn([_ac_init_TARNAME])["])])
++ [AC_INIT: unsafe as a filename: "$4"])])
+ #
+-# These do not use m4_copy because we don't want to copy the pushdef stack.
+-m4_ifndef([AC_PACKAGE_NAME],
+- [m4_define([AC_PACKAGE_NAME],
+- m4_defn([_ac_init_NAME]))])
+-m4_ifndef([AC_PACKAGE_VERSION],
+- [m4_define([AC_PACKAGE_VERSION],
+- m4_defn([_ac_init_VERSION]))])
+-m4_ifndef([AC_PACKAGE_STRING],
+- [m4_define([AC_PACKAGE_STRING],
+- m4_defn([_ac_init_NAME])[ ]m4_defn([_ac_init_VERSION]))])
+-m4_ifndef([AC_PACKAGE_BUGREPORT],
+- [m4_define([AC_PACKAGE_BUGREPORT], _ac_init_BUGREPORT)])
+-m4_ifndef([AC_PACKAGE_TARNAME],
+- [m4_define([AC_PACKAGE_TARNAME],
+- m4_default(m4_defn([_ac_init_TARNAME]),
+- [m4_bpatsubst(m4_tolower(
+- m4_bpatsubst(m4_defn([_ac_init_NAME]),
+- [GNU ])),
+- [[^_abcdefghijklmnopqrstuvwxyz0123456789]],
+- [-])]))])
+-m4_ifndef([AC_PACKAGE_URL],
+- [m4_define([AC_PACKAGE_URL],
+- m4_default(m4_defn([_ac_init_URL]),
+- [m4_if(m4_index(m4_defn([_ac_init_NAME]),
+- [GNU ]), [0],
+- [[https://www.gnu.org/software/]m4_defn([AC_PACKAGE_TARNAME])[/]])]))])
+-m4_popdef([_ac_init_NAME])
+-m4_popdef([_ac_init_VERSION])
+-m4_popdef([_ac_init_BUGREPORT])
+-m4_popdef([_ac_init_TARNAME])
+-m4_popdef([_ac_init_URL])
++m4_define_default([AC_PACKAGE_NAME], [$1])
++m4_define_default([AC_PACKAGE_VERSION], [$2])
++# The m4_strip makes AC_PACKAGE_STRING be [], not [ ], when
++# both $1 and $2 are empty.
++m4_define_default([AC_PACKAGE_STRING], m4_strip([$1 $2]))
++m4_define_default([AC_PACKAGE_BUGREPORT], [$3])
++#
++# N.B. m4_ifnblank strips one layer of quotation from whichever of its
++# second and third argument it evaluates to.
++m4_define_default([AC_PACKAGE_TARNAME],
++ m4_ifnblank([$4], [[$4]],
++ [m4_quote(m4_bpatsubst(m4_tolower(m4_bpatsubst([$1], [^GNU ], [])),
++ [[^_abcdefghijklmnopqrstuvwxyz0123456789]], [-]))]))
++m4_define_default([AC_PACKAGE_URL],
++ m4_ifnblank([$5], [[$5]],
++ [m4_if(m4_index([$1], [GNU ]), [0],
++ [[https://www.gnu.org/software/]m4_defn([AC_PACKAGE_TARNAME])[/]],
++ [])]))
+ ])
+
+
+@@ -363,13 +354,13 @@ m4_define([_AC_INIT_NOTICE],
+ [m4_divert_text([HEADER-COMMENT],
+ [@%:@ Guess values for system-dependent variables and create Makefiles.
+ @%:@ Generated by m4_PACKAGE_STRING[]dnl
+-m4_ifset([AC_PACKAGE_STRING], [ for AC_PACKAGE_STRING]).])
+-
++m4_ifset([AC_PACKAGE_STRING], [ for m4_defn([AC_PACKAGE_STRING]).
++])dnl
+ m4_ifset([AC_PACKAGE_BUGREPORT],
+ [m4_divert_text([HEADER-COMMENT],
+ [@%:@
+-@%:@ Report bugs to <AC_PACKAGE_BUGREPORT>.])])
+-])
++@%:@ Report bugs to: m4_defn([AC_PACKAGE_BUGREPORT])])])
++])])
+
+
+ # _AC_INIT_COPYRIGHT
+@@ -436,18 +427,12 @@ AC_SUBST([SHELL])dnl
+ AC_SUBST([PATH_SEPARATOR])dnl
+
+ # Identity of this package.
+-AC_SUBST([PACKAGE_NAME],
+- [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])dnl
+-AC_SUBST([PACKAGE_TARNAME],
+- [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])dnl
+-AC_SUBST([PACKAGE_VERSION],
+- [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])dnl
+-AC_SUBST([PACKAGE_STRING],
+- [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])dnl
+-AC_SUBST([PACKAGE_BUGREPORT],
+- [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])dnl
+-AC_SUBST([PACKAGE_URL],
+- [m4_ifdef([AC_PACKAGE_URL], ['AC_PACKAGE_URL'])])dnl
++AC_SUBST([PACKAGE_NAME], ['m4_defn([AC_PACKAGE_NAME])'])dnl
++AC_SUBST([PACKAGE_TARNAME], ['m4_defn([AC_PACKAGE_TARNAME])'])dnl
++AC_SUBST([PACKAGE_VERSION], ['m4_defn([AC_PACKAGE_VERSION])'])dnl
++AC_SUBST([PACKAGE_STRING], ['m4_defn([AC_PACKAGE_STRING])'])dnl
++AC_SUBST([PACKAGE_BUGREPORT], ['m4_defn([AC_PACKAGE_BUGREPORT])'])dnl
++AC_SUBST([PACKAGE_URL], ['m4_defn([AC_PACKAGE_URL])'])dnl
+
+ m4_divert_pop([DEFAULTS])dnl
+ m4_wrap_lifo([m4_divert_text([DEFAULTS],
+@@ -1048,9 +1033,9 @@ if test "$ac_init_help" = "long"; then
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
+-\`configure' configures m4_ifset([AC_PACKAGE_STRING],
+- [AC_PACKAGE_STRING],
+- [this package]) to adapt to many kinds of systems.
++\`configure' configures m4_default_nblank(m4_defn([AC_PACKAGE_STRING]),
++ [this package])dnl
++ to adapt to many kinds of systems.
+
+ Usage: $[0] [[OPTION]]... [[VAR=VALUE]]...
+
+@@ -1099,9 +1084,8 @@ Fine tuning of the installation directories:
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+-]AS_HELP_STRING([--docdir=DIR],
+- [documentation root ]@<:@DATAROOTDIR/doc/m4_ifset([AC_PACKAGE_TARNAME],
+- [AC_PACKAGE_TARNAME], [PACKAGE])@:>@)[
++ --docdir=DIR documentation root @<:@DATAROOTDIR/doc/]dnl
++m4_default_quoted(m4_defn([AC_PACKAGE_TARNAME]), [PACKAGE])[@:>@
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+@@ -1139,18 +1123,22 @@ fi
+ if test -n "$ac_init_help"; then
+ m4_ifset([AC_PACKAGE_STRING],
+ [ case $ac_init_help in
+- short | recursive ) echo "Configuration of AC_PACKAGE_STRING:";;
++ short | recursive )
++ AS_ECHO(["Configuration of m4_defn([AC_PACKAGE_STRING]):"]);;
+ esac])
+ cat <<\_ACEOF
+ m4_divert_pop([HELP_ENABLE])dnl
+ m4_divert_push([HELP_END])dnl
+
+-Report bugs to m4_ifset([AC_PACKAGE_BUGREPORT], [<AC_PACKAGE_BUGREPORT>],
+- [the package provider]).dnl
+-m4_ifdef([AC_PACKAGE_NAME], [m4_ifset([AC_PACKAGE_URL], [
+-AC_PACKAGE_NAME home page: <AC_PACKAGE_URL>.])dnl
+-m4_if(m4_index(m4_defn([AC_PACKAGE_NAME]), [GNU ]), [0], [
+-General help using GNU software: <https://www.gnu.org/gethelp/>.])])
++m4_ifset([AC_PACKAGE_BUGREPORT],
++[Report bugs to: m4_defn([AC_PACKAGE_BUGREPORT])
++])dnl
++m4_ifset([AC_PACKAGE_NAME], [m4_ifset([AC_PACKAGE_URL],
++[m4_defn([AC_PACKAGE_NAME]) home page: m4_defn([AC_PACKAGE_URL])
++])])dnl
++m4_if(m4_index(m4_defn([AC_PACKAGE_NAME]), [GNU ]), [0],
++[General help using GNU software: <https://www.gnu.org/gethelp/>.
++])dnl
+ _ACEOF
+ ac_status=$?
+ fi
+@@ -1189,9 +1177,9 @@ m4_define([_AC_INIT_VERSION],
+ [m4_divert_text([VERSION_BEGIN],
+ [if $ac_init_version; then
+ cat <<\_ACEOF
+-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])configure[]dnl
+-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+-generated by m4_PACKAGE_STRING])
++m4_ifset([AC_PACKAGE_NAME], [m4_defn([AC_PACKAGE_NAME]) ])configure[]dnl
++m4_ifset([AC_PACKAGE_VERSION], [ m4_defn([AC_PACKAGE_VERSION])])
++generated by m4_defn([m4_PACKAGE_STRING])])
+ m4_divert_text([VERSION_END],
+ [_ACEOF
+ exit
+@@ -1230,9 +1218,10 @@ cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+
+-It was created by m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])dnl
+-$as_me[]m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]), which was
+-generated by m4_PACKAGE_STRING. Invocation command line was
++It was created by m4_ifset([AC_PACKAGE_NAME], [m4_defn([AC_PACKAGE_NAME]) ])dnl
++$as_me[]m4_ifset([AC_PACKAGE_VERSION],
++ [ m4_defn([AC_PACKAGE_VERSION])]), which was
++generated by m4_defn([m4_PACKAGE_STRING]). Invocation command line was
+
+ $ $[0]$ac_configure_args_raw
+
+@@ -1446,7 +1435,7 @@ m4_define([_AS_FORCE_REEXEC_WITH_CONFIG_SHELL], [yes])
+ AS_INIT[]dnl
+ AS_PREPARE[]dnl
+ m4_divert_push([KILL])
+-m4_ifval([$2], [_AC_INIT_PACKAGE($@)])
++_AC_INIT_PACKAGE($@)
+ _AC_INIT_DEFAULTS
+ _AC_INIT_PARSE_ARGS
+ _AC_INIT_DIRCHECK
+diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
+index 1389f328..aa8324f0 100644
+--- a/lib/autoconf/status.m4
++++ b/lib/autoconf/status.m4
+@@ -1343,9 +1343,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+-This file was extended by m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])dnl
+-$as_me[]m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]), which was
+-generated by m4_PACKAGE_STRING. Invocation command line was
++This file was extended by m4_ifset([AC_PACKAGE_NAME],
++ [m4_defn([AC_PACKAGE_NAME]) ])dnl
++$as_me[]m4_ifset([AC_PACKAGE_VERSION],
++ [ m4_defn([AC_PACKAGE_VERSION])]), which was
++generated by m4_defn([m4_PACKAGE_STRING]). Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -1431,12 +1433,15 @@ m4_ifdef([_AC_SEEN_CONFIG(COMMANDS)],
+ $config_commands
+
+ ])dnl
+-Report bugs to m4_ifset([AC_PACKAGE_BUGREPORT], [<AC_PACKAGE_BUGREPORT>],
+- [the package provider]).dnl
+-m4_ifdef([AC_PACKAGE_NAME], [m4_ifset([AC_PACKAGE_URL], [
+-AC_PACKAGE_NAME home page: <AC_PACKAGE_URL>.])dnl
+-m4_if(m4_index(m4_defn([AC_PACKAGE_NAME]), [GNU ]), [0], [
+-General help using GNU software: <https://www.gnu.org/gethelp/>.])])"
++m4_ifset([AC_PACKAGE_BUGREPORT],
++[Report bugs to: m4_defn([AC_PACKAGE_BUGREPORT])
++]))dnl
++m4_ifset([AC_PACKAGE_NAME], [m4_ifset([AC_PACKAGE_URL],
++[m4_defn([AC_PACKAGE_NAME]) home page: m4_defn([AC_PACKAGE_URL])
++])])dnl
++m4_if(m4_index(m4_defn([AC_PACKAGE_NAME]), [GNU ]), [0],
++[General help using GNU software: <https://www.gnu.org/gethelp/>.
++])"
+
+ _ACEOF
+ ac_cs_config=`AS_ECHO(["$ac_configure_args"]) | sed "$ac_safe_unquote"`
+@@ -1444,9 +1449,9 @@ ac_cs_config_escaped=`AS_ECHO(["$ac_cs_config"]) | sed "s/^ //; s/'/'\\\\\\\\''/
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config='$ac_cs_config_escaped'
+ ac_cs_version="\\
+-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.status[]dnl
+-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+-configured by $[0], generated by m4_PACKAGE_STRING,
++m4_ifset([AC_PACKAGE_NAME], [m4_defn([AC_PACKAGE_NAME]) ])config.status[]dnl
++m4_ifset([AC_PACKAGE_VERSION], [ m4_defn([AC_PACKAGE_VERSION])])
++configured by $[0], generated by m4_defn([m4_PACKAGE_STRING]),
+ with options \\"\$ac_cs_config\\"
+
+ Copyright (C) m4_PACKAGE_YEAR Free Software Foundation, Inc.
+diff --git a/tests/base.at b/tests/base.at
+index 6a1d9742..bc8e1faa 100644
+--- a/tests/base.at
++++ b/tests/base.at
+@@ -238,36 +238,124 @@ AT_CLEANUP
+
+ AT_SETUP([AC_INIT with unusual version strings])
+
++if echo 'ab*c' | grep -F 'ab*c' >/dev/null 2>&1; then
++ FGREP="grep -F"
++else
++ FGREP=fgrep
++fi
++
++# In both of the arguments that might contain URLs, make sure we test
++# all of the unusual ASCII characters that commonly appear in URLs.
++# The RFC 3986 "unreserved" characters are ASCII letters and digits, plus
++# - . _ ~
++# The RFC 3986 "gen-delims" and "sub-delims" are
++# / : ? # [ ] @ ! $ & ' ( ) * + , ; =
++# The URL escape character is
++# %
++# Characters that are still significant for Bourne shell within a
++# single-quoted string, double-quoted string, quoted here-doc, or
++# unquoted here-doc are explicitly not allowed:
++# ' $
++# Also, we don't test unbalanced parentheses or brackets here.
++
+ AT_DATA([configure.ac],
+-[[AC_INIT([GNU String++ with spaces (foo)],
++[[AC_INIT([GNU String++ with spaces
++ (foo)],
+ [2.48++ (2010-07-03)],
+- [[https://example.com/?a=b&c=d#e]],
++ [https://example/~bug/cdfijknoqrvw/-._:@!()[]*+,;/?y=z#1234567890
++],
+ [string++],
+- [[https://example.com/?f=g&h=i%2fj#42]])
++ [HTTPS://EXAMPLE/~PKG/BCDFIJNOQRUVW/-._:@!()[]*+,;/?y=z#1234567890
++])
+ AC_OUTPUT
+ ]])
+
+-if echo 'ab*c' | grep -F 'ab*c' >/dev/null 2>&1; then
+- FGREP="grep -F"
+-else
+- FGREP=fgrep
+-fi
++AT_CHECK_AUTOCONF([-Werror])
++AT_CHECK_CONFIGURE([-q])
++
++AT_CHECK_CONFIGURE([--help], [], [stdout])
++AT_CHECK([[$FGREP \
++ 'https://example/~bug/cdfijknoqrvw/-._:@!()[]*+,;/?y=z#1234567890' \
++ stdout]], [], [ignore])
++AT_CHECK([[$FGREP \
++ 'HTTPS://EXAMPLE/~PKG/BCDFIJNOQRUVW/-._:@!()[]*+,;/?y=z#1234567890' \
++ stdout]], [], [ignore])
++
++AT_CHECK_CONFIGURE([--version], [], [stdout])
++AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore])
++AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore])
++
++AT_CHECK([./config.status --help], [], [stdout])
++AT_CHECK([[$FGREP \
++ 'https://example/~bug/cdfijknoqrvw/-._:@!()[]*+,;/?y=z#1234567890' \
++ stdout]], [], [ignore])
++AT_CHECK([[$FGREP \
++ 'HTTPS://EXAMPLE/~PKG/BCDFIJNOQRUVW/-._:@!()[]*+,;/?y=z#1234567890' \
++ stdout]], [], [ignore])
++
++AT_CHECK([./config.status --version], [], [stdout])
++AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore])
++AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore])
++
++# Repeat the above test using all the unusual characters that might appear
++# in a list of email addresses in both BUG-REPORT and URL. (URL isn't
++# supposed to contain email addresses, but there's no good reason to
++# restrict its syntax.)
++# The RFC 5822 "atext" characters are ASCII letters and digits, plus
++# ! # $ % & ' * + - / = ? ^ _ ` { | } ~
++# The RFC 5822 "special" characters, all of which might appear somewhere
++# in an address list, are
++# ( ) < > [ ] : ; @ \ , . "
++# As above, characters that are significant for Bourne shell within
++# strings and heredocs are explicitly not allowed:
++# ' " ` \ $
++# Whitespace is allowed but collapsed (just like AC_INIT does itself).
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String++ with spaces
++ (foo)],
++ [2.48++ (2010-07-03)],
++ [bugs: fred <A=B?C^D_E@F>,
++ G!H!I#J@K.L (wilma),
++ M%N&O@[156.247.38.49],
++ P*Q+R-S/T@U,
++ {jon|chyp~}@kqtvxz.VWXYZ;],
++ [string++],
++ [contact: jem <A=B?C^D_E@bd>,
++ F!G!H#I@fv.J (lugh),
++ K%L&M@[156.247.38.49],
++ N*O+P-Q/R@STU,
++ {qik|~prys}@wxz.VWXYZ;])
++AC_OUTPUT
++]])
+
+ AT_CHECK_AUTOCONF([-Werror])
+ AT_CHECK_CONFIGURE([-q])
++
+ AT_CHECK_CONFIGURE([--help], [], [stdout])
+-AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore])
+-AT_CHECK([[$FGREP 'com/?f=g&h=i%2fj#42' stdout]], [], [ignore])
++AT_CHECK([[$FGREP \
++ 'bugs: fred <A=B?C^D_E@F>, G!H!I#J@K.L (wilma), M%N&O@[156.247.38.49], P*Q+R-S/T@U, {jon|chyp~}@kqtvxz.VWXYZ;' \
++ stdout]], [], [ignore])
++AT_CHECK([[$FGREP \
++ 'contact: jem <A=B?C^D_E@bd>, F!G!H#I@fv.J (lugh), K%L&M@[156.247.38.49], N*O+P-Q/R@STU, {qik|~prys}@wxz.VWXYZ;' \
++ stdout]], [], [ignore])
++
+ AT_CHECK_CONFIGURE([--version], [], [stdout])
+ AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore])
+ AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore])
+
+ AT_CHECK([./config.status --help], [], [stdout])
+-AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore])
++AT_CHECK([[$FGREP \
++ 'bugs: fred <A=B?C^D_E@F>, G!H!I#J@K.L (wilma), M%N&O@[156.247.38.49], P*Q+R-S/T@U, {jon|chyp~}@kqtvxz.VWXYZ;' \
++ stdout]], [], [ignore])
++AT_CHECK([[$FGREP \
++ 'contact: jem <A=B?C^D_E@bd>, F!G!H#I@fv.J (lugh), K%L&M@[156.247.38.49], N*O+P-Q/R@STU, {qik|~prys}@wxz.VWXYZ;' \
++ stdout]], [], [ignore])
++
+ AT_CHECK([./config.status --version], [], [stdout])
+ AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore])
+ AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore])
+
++# Check for invalid characters in each argument.
+ AT_DATA([configure.ac],
+ [[AC_INIT([GNU "String++"],
+ [2.48], [https://example.com/], [string++])
+@@ -347,6 +435,80 @@ AC_OUTPUT
+ AT_CHECK_AUTOCONF([-Werror], [1], [ignore], [stderr])
+ AT_CHECK([grep 'AC_INIT: unsafe as a filename: ' stderr], [], [ignore])
+
++# Commas and unbalanced close parentheses are especially troublesome for M4.
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU, String], [2.48], [bugs@gstring.example],
++ [string], [https://gstring.example/])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String)], [2.48], [bugs@gstring.example],
++ [string], [https://gstring.example/])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String], [2,48], [bugs@gstring.example],
++ [string], [https://gstring.example/])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String], [2.48)], [bugs@gstring.example],
++ [string], [https://gstring.example/])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String], [2.48], [bugs@gstring.example,
++ gstring-bugs@example.com],
++ [string], [https://gstring.example/])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String], [2.48], [bugs)@gstring.example],
++ [string], [https://gstring.example/])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String], [2.48], [bugs@gstring.example],
++ [string,], [https://gstring.example/])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String], [2.48], [bugs@gstring.example],
++ [string)], [https://gstring.example/])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF([], [0], [ignore], [stderr])
++AT_CHECK([grep 'AC_INIT: unsafe as a filename: ' stderr], [], [ignore])
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String], [2.48], [bugs@gstring.example],
++ [string], [https://gstring.example/docs,html])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
++
++
++AT_DATA([configure.ac],
++[[AC_INIT([GNU String], [2.48], [bugs@gstring.example],
++ [string], [https://gstring.example/weird)/path])
++AC_OUTPUT
++]])
++AT_CHECK_AUTOCONF
+
+ AT_CLEANUP
+
+--
+2.26.2
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2020-12-29 16:14 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2020-12-29 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 8d448f8fb30272100ea115f7a55fe917b38d9ccd
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 16:06:59 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 16:06:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d448f8f
sys-devel/autoconf: Revbump to fix c99 check
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../{autoconf-2.70.ebuild => autoconf-2.70-r1.ebuild} | 4 ++++
.../autoconf/files/autoconf-2.70-fix_c99_check.patch | 15 +++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.70.ebuild b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
similarity index 97%
rename from sys-devel/autoconf/autoconf-2.70.ebuild
rename to sys-devel/autoconf/autoconf-2.70-r1.ebuild
index c2764bdae35..ce4adc5321b 100644
--- a/sys-devel/autoconf/autoconf-2.70.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
@@ -35,6 +35,10 @@ RDEPEND="${BDEPEND}
[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+PATCHES=(
+ "${FILESDIR}/${P}-fix_c99_check.patch"
+)
+
src_prepare() {
# usr/bin/libtool is provided by binutils-apple, need gnu libtool
if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch b/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch
new file mode 100644
index 00000000000..2174e75afeb
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff_plain;f=lib%2Fautoconf%2Fc.m4;h=601c2df41bd4ee602065ce041a1173aca8a0f52e;hp=fe217cad679f2f4506c3e20dee64e7e3e3b83a24;hb=efc940dc82763b7b2d6e65f04d15d5972d829c0a;hpb=b693e208691c54fbe07cdf49b9a98358baadcfe2
+
+diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
+index fe217ca..601c2df 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)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2021-01-28 23:49 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2021-01-28 23:49 UTC (permalink / raw
To: gentoo-commits
commit: f0ed20d57458611ba0b0c2e83af67c0260a3ca00
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 23:47:14 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 23:49:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ed20d5
sys-devel/autoconf: Removed old
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/autoconf/autoconf-2.70-r1.ebuild | 66 ----------------------
.../files/autoconf-2.70-fix_c99_check.patch | 15 -----
2 files changed, 81 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.70-r1.ebuild b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
deleted file mode 100644
index 5ed98221921..00000000000
--- a/sys-devel/autoconf/autoconf-2.70-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
- inherit git-r3
-else
- # For _beta handling replace with real version number
- MY_PV="${PV}"
- MY_P="${PN}-${MY_PV}"
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
- https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
- [[ "${PV}" == *_beta* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-3"
-SLOT="${PV/_*}"
-IUSE="emacs"
-
-BDEPEND=">=sys-devel/m4-1.4.16
- >=dev-lang/perl-5.6"
-RDEPEND="${BDEPEND}
- >=sys-devel/autoconf-wrapper-14
- sys-devel/gnuconfig
- !~sys-devel/${P}:2.5"
-[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix_c99_check.patch"
-)
-
-src_prepare() {
- # usr/bin/libtool is provided by binutils-apple, need gnu libtool
- if [[ ${CHOST} == *-darwin* ]] ; then
- PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
- fi
-
- # Save timestamp to avoid later makeinfo call
- touch -r doc/{,old_}autoconf.texi || die
-
- toolchain-autoconf_src_prepare
-
- # Restore timestamp to avoid makeinfo call
- # We already have an up to date autoconf.info page at this point.
- touch -r doc/{old_,}autoconf.texi || die
-}
-
-src_install() {
- default
-
- local f
- for f in config.{guess,sub} ; do
- ln -fs ../../gnuconfig/${f} \
- "${ED}"/usr/share/autoconf-*/build-aux/${f} || die
- done
-}
diff --git a/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch b/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch
deleted file mode 100644
index 2174e75afeb..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff_plain;f=lib%2Fautoconf%2Fc.m4;h=601c2df41bd4ee602065ce041a1173aca8a0f52e;hp=fe217cad679f2f4506c3e20dee64e7e3e3b83a24;hb=efc940dc82763b7b2d6e65f04d15d5972d829c0a;hpb=b693e208691c54fbe07cdf49b9a98358baadcfe2
-
-diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
-index fe217ca..601c2df 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)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2022-09-19 16:26 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-09-19 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 79c0b97504177b9ee374e3d96af8b03349b86d12
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 16:07:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 16:26:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c0b975
sys-devel/autoconf: backport K&R decls fix to 2.69
Backport the K&R decls fix to 2.69 to avoid configure tests
failing (often "silently", i.e. doesn't fail the build of
the package overall, just leads to wrong results) with
newer compilers like the upcoming Clang 16.
A consequence of this whole fuss is that we're going to
have to eautoreconf in a bunch of older packages, but
as Ionen pointed out on IRC, this means we get some
other stuff for free like Python 3.10 fixes, so it's
not all bad.
Undecided how to handle any packages with a generated
configure from autoconfs not in tree. We may just
patch the configure manually. Will see.
See linked bug 870412 and the Discourse thread therein for
details if unfamiliar.
As I remarked on IRC, it's unfortunate to have to backport anything
which will then infect generated configure, as it's somewhat
a repeat of the --runstatedir situation, and it leads to confusion/hassle
when sending patches upstream where a generated/bootstrapped configure
is required.
But this is different - it's a (serious) bug being fixed
rather than a gratuitous (although) understandable given we weren't
sure if we'd ever see another autoconf release backport of a new
feature.
Bug: https://bugs.gentoo.org/806376
Bug: https://bugs.gentoo.org/870412
Thanks-to: Arsen Arsenovic <arsen <AT> aarsen.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/autoconf/autoconf-2.69-r7.ebuild | 63 ++++
.../files/autoconf-2.69-K-R-decls-clang.patch | 387 +++++++++++++++++++++
2 files changed, 450 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.69-r7.ebuild b/sys-devel/autoconf/autoconf-2.69-r7.ebuild
new file mode 100644
index 000000000000..cb848359043b
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.69-r7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+ ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
+ https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3"
+SLOT="${PV}"
+IUSE="emacs"
+
+BDEPEND="
+ >=sys-devel/m4-1.4.16
+ >=dev-lang/perl-5.6
+"
+RDEPEND="
+ ${BDEPEND}
+ >=sys-devel/autoconf-wrapper-13
+ !~sys-devel/${P}:2.5
+"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.69-perl-5.26.patch
+ "${FILESDIR}"/${P}-fix-libtool-test.patch
+ "${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
+ "${FILESDIR}"/${P}-make-tests-bash5-compatible.patch
+ "${FILESDIR}"/${P}-K-R-decls-clang.patch
+
+ "${WORKDIR}"/patches/${P}-texinfo.patch
+)
+
+src_prepare() {
+ # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+ fi
+
+ # Save timestamp to avoid later makeinfo call
+ touch -r doc/{,old_}autoconf.texi || die
+
+ toolchain-autoconf_src_prepare
+
+ # Restore timestamp to avoid makeinfo call
+ # We already have an up to date autoconf.info page at this point.
+ touch -r doc/{old_,}autoconf.texi || die
+}
diff --git a/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch b/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch
new file mode 100644
index 000000000000..c0ae05540146
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch
@@ -0,0 +1,387 @@
+https://bugs.gentoo.org/870412
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b
+
+Backport the K&R decls fix to 2.69 to avoid configure tests
+failing (often "silently", i.e. doesn't fail the build of
+the package overall, just leads to wrong results) with
+newer compilers like the upcoming Clang 16.
+
+From e6f401b94b58bb9bb58cd668a996e27663d3e6c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Mon, 19 Sep 2022 12:11:24 +0200
+Subject: [PATCH] backport K&R decl fixes
+
+--- a/doc/autoconf.texi
++++ b/doc/autoconf.texi
+@@ -5201,9 +5201,7 @@ the @samp{#undef malloc}):
+ #include <config.h>
+ #undef malloc
+
+-#include <sys/types.h>
+-
+-void *malloc ();
++#include <stdlib.h>
+
+ /* Allocate an N-byte block of memory from the heap.
+ If N is zero, allocate a 1-byte block. */
+@@ -8057,7 +8055,7 @@ needed:
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int F77_DUMMY_MAIN () @{ return 1; @}
++ int F77_DUMMY_MAIN (void) @{ return 1; @}
+ #endif
+ @end example
+
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -97,7 +97,7 @@ m4_define([AC_LANG_PROGRAM(C)],
+ m4_ifdef([_AC_LANG_PROGRAM_C_F77_HOOKS], [_AC_LANG_PROGRAM_C_F77_HOOKS])[]dnl
+ m4_ifdef([_AC_LANG_PROGRAM_C_FC_HOOKS], [_AC_LANG_PROGRAM_C_FC_HOOKS])[]dnl
+ int
+-main ()
++main (void)
+ {
+ dnl Do *not* indent the following line: there may be CPP directives.
+ dnl Don't move the `;' right after for the same reason.
+@@ -130,7 +130,7 @@ m4_if([$2], [main], ,
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $2 ();])], [return $2 ();])])
++char $2 (void);])], [return $2 ();])])
+
+
+ # AC_LANG_FUNC_LINK_TRY(C)(FUNCTION)
+@@ -154,7 +154,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
+ #define $1 innocuous_$1
+
+ /* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $1 (); below.
++ which can conflict with char $1 (void); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+@@ -172,7 +172,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $1 ();
++char $1 (void);
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+@@ -201,8 +201,8 @@ return test_array @<:@0@:>@;
+ # But we include them only after the EXPRESSION has been evaluated.
+ m4_define([AC_LANG_INT_SAVE(C)],
+ [AC_LANG_PROGRAM([$1
+-static long int longval () { return $2; }
+-static unsigned long int ulongval () { return $2; }
++static long int longval (void) { return $2; }
++static unsigned long int ulongval (void) { return $2; }
+ @%:@include <stdio.h>
+ @%:@include <stdlib.h>],
+ [
+@@ -1625,8 +1625,8 @@ for ac_kw in inline __inline__ __inline; do
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+ [#ifndef __cplusplus
+ typedef int foo_t;
+-static $ac_kw foo_t static_foo () {return 0; }
+-$ac_kw foo_t foo () {return 0; }
++static $ac_kw foo_t static_foo (void) {return 0; }
++$ac_kw foo_t foo (void) {return 0; }
+ #endif
+ ])],
+ [ac_cv_c_inline=$ac_kw])
+@@ -1949,7 +1949,7 @@ m4_define([_AC_LANG_OPENMP(C)],
+ choke me
+ #endif
+ #include <omp.h>
+-int main () { return omp_get_num_threads (); }
++int main (void) { return omp_get_num_threads (); }
+ ])
+
+ # _AC_LANG_OPENMP(C++)
+--- a/lib/autoconf/functions.m4
++++ b/lib/autoconf/functions.m4
+@@ -463,9 +463,6 @@ AC_CACHE_CHECK([whether closedir returns void],
+ [ac_cv_func_closedir_void],
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+ #include <$ac_header_dirent>
+-#ifndef __cplusplus
+-int closedir ();
+-#endif
+ ],
+ [[return closedir (opendir (".")) != 0;]])],
+ [ac_cv_func_closedir_void=no],
+@@ -893,7 +890,7 @@ AC_CACHE_CHECK([for GNU libc compatible malloc], ac_cv_func_malloc_0_nonnull,
+ [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *malloc ();
++char *malloc (long);
+ #endif
+ ]],
+ [return ! malloc (0);])],
+@@ -1029,7 +1026,7 @@ static const char *tz_strings[] = {
+ /* Return 0 if mktime fails to convert a date in the spring-forward gap.
+ Based on a problem report from Andreas Jaeger. */
+ static int
+-spring_forward_gap ()
++spring_forward_gap (void)
+ {
+ /* glibc (up to about 1998-10-07) failed this test. */
+ struct tm tm;
+@@ -1066,7 +1063,7 @@ mktime_test (time_t now)
+ }
+
+ static int
+-irix_6_4_bug ()
++irix_6_4_bug (void)
+ {
+ /* Based on code from Ariel Faigon. */
+ struct tm tm;
+@@ -1108,7 +1105,7 @@ bigtime_test (int j)
+ }
+
+ static int
+-year_2050_test ()
++year_2050_test (void)
+ {
+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
+ ignoring leap seconds. */
+@@ -1138,7 +1135,7 @@ year_2050_test ()
+ }
+
+ int
+-main ()
++main (void)
+ {
+ time_t t, delta;
+ int i, j;
+@@ -1232,7 +1229,7 @@ AC_CACHE_CHECK([for working mmap], [ac_cv_func_mmap_fixed_mapped],
+ #include <sys/mman.h>
+
+ #if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+-char *malloc ();
++char *malloc (void *, long);
+ #endif
+
+ /* This mess was copied from the GNU getpagesize.h. */
+@@ -1268,7 +1265,7 @@ char *malloc ();
+ #endif /* no HAVE_GETPAGESIZE */
+
+ int
+-main ()
++main (void)
+ {
+ char *data, *data2, *data3;
+ const char *cdata2;
+@@ -1398,7 +1395,7 @@ AC_CACHE_CHECK([for GNU libc compatible realloc], ac_cv_func_realloc_0_nonnull,
+ [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *realloc ();
++char *realloc (void *, long);
+ #endif
+ ]],
+ [return ! realloc (0, 0);])],
+@@ -1547,11 +1544,8 @@ AC_DEFUN([AC_FUNC_STRTOD],
+ AC_CACHE_CHECK(for working strtod, ac_cv_func_strtod,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ ]AC_INCLUDES_DEFAULT[
+-#ifndef strtod
+-double strtod ();
+-#endif
+ int
+-main()
++main(void)
+ {
+ {
+ /* Some versions of Linux strtod mis-parse strings with leading '+'. */
+@@ -1645,8 +1639,7 @@ AC_CACHE_CHECK([whether strerror_r returns char *],
+ # former has a strerror_r that returns char*, while the latter
+ # has a strerror_r that returns `int'.
+ # This test should segfault on the DEC system.
+- AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+- extern char *strerror_r ();],
++ AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
+ [[char buf[100];
+ char x = *strerror_r (0, buf, sizeof buf);
+ return ! isalpha (x);]])],
+@@ -1879,7 +1872,7 @@ sparc_address_test (arg) int arg;
+ }
+
+ int
+-main ()
++main (void)
+ {
+ pid_t parent = getpid ();
+ pid_t child;
+@@ -1985,7 +1978,7 @@ AC_CACHE_CHECK([for wait3 that fills in rusage],
+ #include <sys/wait.h>
+ /* HP-UX has wait3 but does not fill in rusage at all. */
+ int
+-main ()
++main (void)
+ {
+ struct rusage r;
+ int i;
+--- a/lib/autoconf/headers.m4
++++ b/lib/autoconf/headers.m4
+@@ -712,7 +712,7 @@ if test $ac_cv_header_stdc = yes; then
+
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+-main ()
++main (void)
+ {
+ int i;
+ for (i = 0; i < 256; i++)
+--- a/lib/autoconf/specific.m4
++++ b/lib/autoconf/specific.m4
+@@ -257,7 +257,7 @@ void ucatch (dummy) int dummy; { }
+ #endif
+
+ int
+-main ()
++main (void)
+ {
+ int i = fork (), status;
+
+--- a/lib/autoconf/types.m4
++++ b/lib/autoconf/types.m4
+@@ -267,7 +267,7 @@ AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
+ #define MAX(x, y) ((x) > (y) ? (x) : (y))
+
+ int
+-main ()
++main (void)
+ {
+ gid_t gidset[NGID];
+ int i, n;
+--- a/tests/c.at
++++ b/tests/c.at
+@@ -354,7 +354,7 @@ AT_DATA([foo.c],
+ #endif
+ #include <stdio.h>
+
+-int main ()
++int main (void)
+ {
+ #ifdef _OPENMP
+ #pragma omp parallel
+@@ -404,7 +404,7 @@ foo.@OBJEXT@: foo.cpp
+ ]])
+
+ AT_DATA([foo.cpp],
+-[[int main ()
++[[int main (void)
+ {
+ return 0;
+ }
+--- a/tests/compile.at
++++ b/tests/compile.at
+@@ -124,7 +124,7 @@ AC_PROG_CC
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifndef PACKAGE_NAME
+ choke me
+ #endif
+-int main ()
++int main (void)
+ {
+ return 0;
+ }
+@@ -150,7 +150,7 @@ AC_LANG([C++])
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifndef PACKAGE_NAME
+ choke me
+ #endif
+-int main ()
++int main (void)
+ {
+ return 0;
+ }
+@@ -249,7 +249,7 @@ AT_CHECK([sed -n 's/ *$//; /#define PACKAGE/,$p' stdout], [],
+
+ const char hw[] = "Hello, World\n";
+ int
+-main ()
++main (void)
+ {
+ fputs (hw, stdout);
+ ;
+@@ -269,7 +269,7 @@ AT_KEYWORDS([AC_LANG_DEFINES_PROVIDED])
+
+ AT_DATA([configure.ac],
+ [[AC_INIT
+-AC_COMPILE_IFELSE([int main () { return 0; }], [],
++AC_COMPILE_IFELSE([int main (void) { return 0; }], [],
+ [AC_MSG_ERROR([compiling trivial program failed])])
+ ]])
+
+@@ -280,7 +280,7 @@ AT_CHECK_CONFIGURE([-q])
+
+ AT_DATA([configure.ac],
+ [[AC_INIT
+-AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED()int main () { return 0; }], [],
++AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED()int main (void) { return 0; }], [],
+ [AC_MSG_ERROR([compiling trivial program failed])])
+ ]])
+
+@@ -324,7 +324,7 @@ test $estatus != 2 &&
+ AC_MSG_ERROR([did not get as 2 exit status: $estatus])])
+
+ # The old stinky one.
+-AC_TRY_RUN([int main () { return 3; }],
++AC_TRY_RUN([int main (void) { return 3; }],
+ [AC_MSG_ERROR([saw `return 3' as a success])],
+ [estatus=$?
+ test $estatus != 3 &&
+--- a/tests/fortran.at
++++ b/tests/fortran.at
+@@ -223,7 +223,7 @@ void FOOBAR_F77 (double *x, double *y);
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int F77_DUMMY_MAIN () { return 1; }
++ int F77_DUMMY_MAIN (void) { return 1; }
+ #endif
+
+ int main(int argc, char *argv[])
+@@ -301,7 +301,7 @@ void FOOBAR_FC(double *x, double *y);
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int FC_DUMMY_MAIN () { return 1; }
++ int FC_DUMMY_MAIN (void) { return 1; }
+ #endif
+
+ int main (int argc, char *argv[])
+@@ -533,7 +533,7 @@ void @foobar@ (int *x);
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int F77_DUMMY_MAIN () { return 1; }
++ int F77_DUMMY_MAIN (void) { return 1; }
+ #endif
+
+ int main(int argc, char *argv[])
+@@ -607,7 +607,7 @@ void @foobar@ (int *x);
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int FC_DUMMY_MAIN () { return 1; }
++ int FC_DUMMY_MAIN (void) { return 1; }
+ #endif
+
+ int main(int argc, char *argv[])
+--- a/tests/semantics.at
++++ b/tests/semantics.at
+@@ -107,7 +107,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS],
+ [[int yes = 1;
+ enum { myenum };
+ struct { int x[20]; } mystruct;
+- extern int myfunc();
++ extern int myfunc (void);
+ #define mymacro1(arg) arg
+ #define mymacro2]])
+ # The difference in space-before-open-paren is intentional.
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2022-09-19 16:26 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-09-19 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 0acd23de8af61e7b900c3ff2c0fcbfe0b0ddc3a3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 03:01:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 16:26:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0acd23de
sys-devel/autoconf: backport K&R decls fix to 2.71
Backport the K&R decls fix to 2.71 to avoid configure tests
failing (often "silently", i.e. doesn't fail the build of
the package overall, just leads to wrong results) with
newer compilers like the upcoming Clang 16.
A consequence of this whole fuss is that we're going to
have to eautoreconf in a bunch of older packages, but
as Ionen pointed out on IRC, this means we get some
other stuff for free like Python 3.10 fixes, so it's
not all bad.
Undecided how to handle any packages with a generated
configure from autoconfs not in tree. We may just
patch the configure manually. Will see.
See linked bug 870412 and the Discourse thread therein for
details if unfamiliar.
Patches:
- AC_C_BIGENDIAN-lto.patch ("Port AC_C_BIGENDIAN to cross gcc -std=c11 -flto")
- AC_LANG_CALL_C_cxx.patch ("Port AC_LANG_CALL(C) to C++")
- K-R-decls-clang.patch ("Port to compilers that moan about K&R func decls")
The first two are included to make the latter apply cleanly, but they're
also both harmless and desirable.
As I remarked on IRC, it's unfortunate to have to backport anything
which will then infect generated configure, as it's somewhat
a repeat of the --runstatedir situation, and it leads to confusion/hassle
when sending patches upstream where a generated/bootstrapped configure
is required.
But this is different - it's a (serious) bug being fixed
rather than a gratuitous (although) understandable given we weren't
sure if we'd ever see another autoconf release backport of a new
feature.
Backports to 2.69 & 2.13 to follow.
Bug: https://bugs.gentoo.org/806376
Bug: https://bugs.gentoo.org/870412
Thanks-to: Arsen Arsenovic <arsen <AT> aarsen.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/autoconf/autoconf-2.71-r3.ebuild | 87 +++++++++++++
.../files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch | 50 ++++++++
.../files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch | 30 +++++
.../files/autoconf-2.71-K-R-decls-clang.patch | 136 +++++++++++++++++++++
4 files changed, 303 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.71-r3.ebuild b/sys-devel/autoconf/autoconf-2.71-r3.ebuild
new file mode 100644
index 000000000000..5077d33753e4
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.71-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+ inherit git-r3
+else
+ # For _beta handling replace with real version number
+ MY_PV="${PV}"
+ MY_P="${PN}-${MY_PV}"
+ #PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
+ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+ https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ #SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
+
+ if ! [[ ${PV} == *_beta* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ fi
+ S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3"
+SLOT="${PV/_*}"
+IUSE="emacs"
+
+# for 2.71, our Perl time resolution patch changes our min Perl from 5.6
+# (vanilla upstream for 2.71) to 5.8.
+BDEPEND=">=sys-devel/m4-1.4.16
+ >=dev-lang/perl-5.8"
+RDEPEND="${BDEPEND}
+ >=sys-devel/autoconf-wrapper-15
+ sys-devel/gnuconfig
+ !~sys-devel/${P}:2.5"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-AC_LANG_CALL_C_cxx.patch
+ "${FILESDIR}"/${P}-time.patch
+ "${FILESDIR}"/${P}-AC_C_BIGENDIAN-lto.patch
+ "${FILESDIR}"/${P}-K-R-decls-clang.patch
+ "${FILESDIR}"/${P}-make-4.4.patch
+)
+
+src_prepare() {
+ # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
+ fi
+
+ # Save timestamp to avoid later makeinfo call
+ touch -r doc/{,old_}autoconf.texi || die
+
+ local pdir
+ for pdir in "${WORKDIR}"/{upstream_,}patches ; do
+ if [[ -d "${pdir}" ]] ; then
+ eapply ${pdir}
+ fi
+ done
+
+ toolchain-autoconf_src_prepare
+
+ # Restore timestamp to avoid makeinfo call
+ # We already have an up to date autoconf.info page at this point.
+ touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ toolchain-autoconf_src_install
+
+ local f
+ for f in config.{guess,sub} ; do
+ ln -fs ../../gnuconfig/${f} \
+ "${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+ done
+}
diff --git a/sys-devel/autoconf/files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch b/sys-devel/autoconf/files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch
new file mode 100644
index 000000000000..48fbdc6f544b
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch
@@ -0,0 +1,50 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=234fc6c86613ed3f366dd1d88996e4d5d85ee222
+
+From 234fc6c86613ed3f366dd1d88996e4d5d85ee222 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Wed, 27 Jul 2022 08:53:35 -0700
+Subject: Port AC_C_BIGENDIAN to cross gcc -std=c11 -flto
+
+* lib/autoconf/c.m4 (AC_C_BIGENDIAN): Improve the
+inherently-unportable grep trick well enough to survive gcc
+-std=c11 -flto when cross-compiling (sr#110687).
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -1838,8 +1838,8 @@ AC_DEFUN([AC_C_BIGENDIAN],
+ [ac_cv_c_bigendian=no],
+ [ac_cv_c_bigendian=yes],
+ [# Try to guess by grepping values from an object file.
+- AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM(
++ AC_LINK_IFELSE(
++ [AC_LANG_SOURCE(
+ [[unsigned short int ascii_mm[] =
+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ unsigned short int ascii_ii[] =
+@@ -1854,13 +1854,20 @@ AC_DEFUN([AC_C_BIGENDIAN],
+ int use_ebcdic (int i) {
+ return ebcdic_mm[i] + ebcdic_ii[i];
+ }
+- extern int foo;
+- ]],
+- [[return use_ascii (foo) == use_ebcdic (foo);]])],
+- [if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
++ int
++ main (int argc, char **argv)
++ {
++ /* Intimidate the compiler so that it does not
++ optimize the arrays away. */
++ char *p = argv[0];
++ ascii_mm[1] = *p++; ebcdic_mm[1] = *p++;
++ ascii_ii[1] = *p++; ebcdic_ii[1] = *p++;
++ return use_ascii (argc) == use_ebcdic (*p);
++ }]])],
++ [if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
+ ac_cv_c_bigendian=yes
+ fi
+- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++ if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
+ if test "$ac_cv_c_bigendian" = unknown; then
+ ac_cv_c_bigendian=no
+ else
+cgit v1.1
diff --git a/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch b/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
new file mode 100644
index 000000000000..c997c52e57d8
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
@@ -0,0 +1,30 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc
+
+From b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue, 31 Aug 2021 16:30:46 -0700
+Subject: Port AC_LANG_CALL(C) to C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* lib/autoconf/c.m4 (AC_LANG_CALL(C)): Add an extern "C" if C++.
+Problem reported by Vincent Lefèvre (sr #110532).
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -126,7 +126,13 @@ m4_define([AC_LANG_CALL(C)],
+ m4_if([$2], [main], ,
+ [/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
++ builtin and then its argument prototype would still apply.
++ The 'extern "C"' is for builds by C++ compilers;
++ although this is not generally supported in C code, supporting it here
++ has little cost and some practical benefit (sr 110532). */
++#ifdef __cplusplus
++extern "C"
++#endif
+ char $2 ();])], [return $2 ();])])
+
+
+cgit v1.1
diff --git a/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch b/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch
new file mode 100644
index 000000000000..098d3b9c6033
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch
@@ -0,0 +1,136 @@
+https://bugs.gentoo.org/870412
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b
+
+Backport the K&R decls fix to 2.69 to avoid configure tests
+failing (often "silently", i.e. doesn't fail the build of
+the package overall, just leads to wrong results) with
+newer compilers like the upcoming Clang 16.
+
+From 8b5e2016c7ed2d67f31b03a3d2e361858ff5299b Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 1 Sep 2022 16:19:50 -0500
+Subject: Port to compilers that moan about K&R func decls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* lib/autoconf/c.m4 (AC_LANG_CALL, AC_LANG_FUNC_LINK_TRY):
+Use '(void)' rather than '()' in function prototypes, as the latter
+provokes fatal errors in some compilers nowadays.
+* lib/autoconf/functions.m4 (AC_FUNC_STRTOD):
+* tests/fortran.at (AC_F77_DUMMY_MAIN usage):
+* tests/semantics.at (AC_CHECK_DECLS):
+Don’t use () in a function decl.
+--- a/doc/autoconf.texi
++++ b/doc/autoconf.texi
+@@ -5460,9 +5460,7 @@ the @samp{#undef malloc}):
+ #include <config.h>
+ #undef malloc
+
+-#include <sys/types.h>
+-
+-void *malloc ();
++#include <stdlib.h>
+
+ /* Allocate an N-byte block of memory from the heap.
+ If N is zero, allocate a 1-byte block. */
+@@ -8297,7 +8295,7 @@ needed:
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int F77_DUMMY_MAIN () @{ return 1; @}
++ int F77_DUMMY_MAIN (void) @{ return 1; @}
+ #endif
+ @end example
+
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -133,7 +133,7 @@ m4_if([$2], [main], ,
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $2 ();])], [return $2 ();])])
++char $2 (void);])], [return $2 ();])])
+
+
+ # AC_LANG_FUNC_LINK_TRY(C)(FUNCTION)
+@@ -157,7 +157,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
+ #define $1 innocuous_$1
+
+ /* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $1 (); below. */
++ which can conflict with char $1 (void); below. */
+
+ #include <limits.h>
+ #undef $1
+@@ -168,7 +168,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $1 ();
++char $1 (void);
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+--- a/lib/autoconf/functions.m4
++++ b/lib/autoconf/functions.m4
+@@ -1613,9 +1613,6 @@ AC_DEFUN([AC_FUNC_STRTOD],
+ AC_CACHE_CHECK(for working strtod, ac_cv_func_strtod,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ ]AC_INCLUDES_DEFAULT[
+-#ifndef strtod
+-double strtod ();
+-#endif
+ int
+ main (void)
+ {
+--- a/tests/fortran.at
++++ b/tests/fortran.at
+@@ -233,7 +233,7 @@ void FOOBAR_F77 (double *x, double *y);
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int F77_DUMMY_MAIN () { return 1; }
++ int F77_DUMMY_MAIN (void) { return 1; }
+ #endif
+
+ int main(int argc, char *argv[])
+@@ -315,7 +315,7 @@ void FOOBAR_FC(double *x, double *y);
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int FC_DUMMY_MAIN () { return 1; }
++ int FC_DUMMY_MAIN (void) { return 1; }
+ #endif
+
+ int main (int argc, char *argv[])
+@@ -561,7 +561,7 @@ void @foobar@ (int *x);
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int F77_DUMMY_MAIN () { return 1; }
++ int F77_DUMMY_MAIN (void) { return 1; }
+ #endif
+
+ int main(int argc, char *argv[])
+@@ -637,7 +637,7 @@ void @foobar@ (int *x);
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+- int FC_DUMMY_MAIN () { return 1; }
++ int FC_DUMMY_MAIN (void) { return 1; }
+ #endif
+
+ int main(int argc, char *argv[])
+--- a/tests/semantics.at
++++ b/tests/semantics.at
+@@ -207,7 +207,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS],
+ [[extern int yes;
+ enum { myenum };
+ extern struct mystruct_s { int x[20]; } mystruct;
+- extern int myfunc();
++ extern int myfunc (int);
+ #define mymacro1(arg) arg
+ #define mymacro2]])
+ # Ensure we can detect missing declarations of functions whose
+cgit v1.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2022-09-19 19:10 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-09-19 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 855f1f72f42c2f9b5ed97220e3ced97a35aa075b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 19:09:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 19:10:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855f1f72
sys-devel/autoconf: workaround bad quoting in packages
While the packages which break with the comma are themselves
broken (need more quoting), we've got our hands full, so
just mangle the patch to drop the comma in a comment
added by autoconf-2.71-AC_LANG_CALL_C_cxx.patch.
Bug: https://bugs.gentoo.org/871753
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../autoconf/{autoconf-2.71-r3.ebuild => autoconf-2.71-r4.ebuild} | 0
sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch | 7 ++++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys-devel/autoconf/autoconf-2.71-r3.ebuild b/sys-devel/autoconf/autoconf-2.71-r4.ebuild
similarity index 100%
rename from sys-devel/autoconf/autoconf-2.71-r3.ebuild
rename to sys-devel/autoconf/autoconf-2.71-r4.ebuild
diff --git a/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch b/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
index c997c52e57d8..5b53d17135bc 100644
--- a/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
+++ b/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
@@ -1,5 +1,10 @@
https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc
+Note: we drop the comma from the comment because some packages
+have bad quoting, and while that will need to be sorted when/if
+autoconf 2.72 is released, we've got our hands full with the
+Clang situation right now (bug #871753).
+
From b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 31 Aug 2021 16:30:46 -0700
@@ -19,7 +24,7 @@ Problem reported by Vincent Lefèvre (sr #110532).
- builtin and then its argument prototype would still apply. */
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
-+ although this is not generally supported in C code, supporting it here
++ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2022-11-03 1:52 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-11-03 1:52 UTC (permalink / raw
To: gentoo-commits
commit: d172fe309bd90487b1f61a106efd2a8b68f10367
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 01:51:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 01:51:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d172fe30
sys-devel/autoconf: more Clang 16 fixes for autoconf 2.13
Bug: https://bugs.gentoo.org/874366
See: c305a45884a8f01838d6e032f469d7f9423154e1
Signed-off-by: Sam James <sam <AT> gentoo.org>
...conf-2.13-r4.ebuild => autoconf-2.13-r5.ebuild} | 0
...onf-2.13-Clang-16-fixes-for-various-tests.patch | 88 +++++++++++++++++-----
2 files changed, 71 insertions(+), 17 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.13-r4.ebuild b/sys-devel/autoconf/autoconf-2.13-r5.ebuild
similarity index 100%
rename from sys-devel/autoconf/autoconf-2.13-r4.ebuild
rename to sys-devel/autoconf/autoconf-2.13-r5.ebuild
diff --git a/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch b/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
index b9319f0a4b71..55eda96241ab 100644
--- a/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
+++ b/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
@@ -1,4 +1,4 @@
-From de47e22d9b4f5fd5f1c9b9de798218a46ef94b98 Mon Sep 17 00:00:00 2001
+From 42a47ba46cacb85dfcf6efdba372a3eb3995a844 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 3 Nov 2022 01:19:39 +0000
Subject: [PATCH] Clang 16 fixes for various tests
@@ -8,6 +8,7 @@ issues in various built-in tests.
Noticed when building XEmacs 21.4 (thanks to matsl for reporting).
+Bug: https://bugs.gentoo.org/874366
Signed-off-by: Sam James <sam@gentoo.org>
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -37,7 +38,16 @@ Signed-off-by: Sam James <sam@gentoo.org>
#include <$ac_header_dirent>
int closedir(...); int main(void) { exit(closedir(opendir(".")) != 0); }],
ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)])
-@@ -988,6 +990,7 @@ AC_DEFUN(AC_FUNC_CLOSEDIR_VOID,
+@@ -907,6 +909,8 @@ AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
+ changequote(<<, >>)dnl
+ <<
+ /* Thanks to Mike Rendell for this test. */
++#include <stdlib.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #define NGID 256
+ #undef MAX
+@@ -988,6 +992,7 @@ AC_DEFUN(AC_FUNC_CLOSEDIR_VOID,
[AC_REQUIRE([AC_HEADER_DIRENT])dnl
AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
[AC_TRY_RUN([#include <sys/types.h>
@@ -45,7 +55,18 @@ Signed-off-by: Sam James <sam@gentoo.org>
#include <$ac_header_dirent>
int closedir(...); int main(void) { exit(closedir(opendir(".")) != 0); }],
ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)])
-@@ -1038,6 +1041,7 @@ AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
+@@ -1001,7 +1006,9 @@ AC_DEFUN(AC_FUNC_FNMATCH,
+ # Some versions of Solaris or SCO have a broken fnmatch function.
+ # So we run a test program. If we are cross-compiling, take no chance.
+ # Thanks to John Oleynick and Franc,ois Pinard for this test.
+-[AC_TRY_RUN([int main(void) { exit (fnmatch ("a*", "abc", 0) != 0); }],
++[AC_TRY_RUN([#include <stdlib.h>
++#include <fnmatch.h>
++int main(void) { exit (fnmatch ("a*", "abc", 0) != 0); }],
+ ac_cv_func_fnmatch_works=yes, ac_cv_func_fnmatch_works=no,
+ ac_cv_func_fnmatch_works=no)])
+ if test $ac_cv_func_fnmatch_works = yes; then
+@@ -1038,6 +1045,7 @@ AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
#include <sys/types.h>
#include <fcntl.h>
#include <sys/mman.h>
@@ -53,7 +74,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
/* This mess was copied from the GNU getpagesize.h. */
#ifndef HAVE_GETPAGESIZE
-@@ -1165,49 +1169,17 @@ AC_DEFUN(AC_FUNC_GETPGRP,
+@@ -1165,49 +1173,17 @@ AC_DEFUN(AC_FUNC_GETPGRP,
*
* Snarfed from Chet Ramey's bash pgrp.c test program
*/
@@ -111,7 +132,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
}
], ac_cv_func_getpgrp_void=yes, ac_cv_func_getpgrp_void=no,
AC_MSG_ERROR(cannot check getpgrp if cross compiling))
-@@ -1220,9 +1192,7 @@ fi
+@@ -1220,9 +1196,7 @@ fi
AC_DEFUN(AC_FUNC_SETPGRP,
[AC_CACHE_CHECK(whether setpgrp takes no argument, ac_cv_func_setpgrp_void,
AC_TRY_RUN([
@@ -122,7 +143,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
/*
* If this system has a BSD-style setpgrp, which takes arguments, exit
-@@ -1230,10 +1200,13 @@ AC_TRY_RUN([
+@@ -1230,10 +1204,13 @@ AC_TRY_RUN([
*/
int main(void)
{
@@ -140,7 +161,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
}
], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes,
AC_MSG_ERROR(cannot check setpgrp if cross compiling))
-@@ -1255,9 +1228,11 @@ AC_DEFUN(AC_FUNC_VFORK,
+@@ -1255,9 +1232,11 @@ AC_DEFUN(AC_FUNC_VFORK,
AC_CHECK_HEADER(vfork.h, AC_DEFINE(HAVE_VFORK_H))
AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
[AC_TRY_RUN([/* Thanks to Paul Eggert for this test. */
@@ -152,7 +173,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-@@ -1270,7 +1245,7 @@ AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
+@@ -1270,7 +1249,7 @@ AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
but some compilers (e.g. gcc -O) don't grok <vfork.h>.
Test for this by using a static variable whose address
is put into a register that is clobbered by the vfork. */
@@ -161,23 +182,35 @@ Signed-off-by: Sam James <sam@gentoo.org>
#ifdef __cplusplus
sparc_address_test (int arg)
#else
-@@ -1359,6 +1334,7 @@ AC_DEFUN(AC_FUNC_WAIT3,
+@@ -1359,6 +1338,8 @@ AC_DEFUN(AC_FUNC_WAIT3,
#include <sys/time.h>
#include <sys/resource.h>
#include <stdio.h>
+#include <stdlib.h>
++#include <unistd.h>
/* HP-UX has wait3 but does not fill in rusage at all. */
int main(void) {
struct rusage r;
-@@ -1582,6 +1558,7 @@ AC_DEFUN(AC_FUNC_UTIME_NULL,
+@@ -1452,7 +1433,8 @@ done
+ fi
+
+ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+-[AC_TRY_RUN([find_stack_direction ()
++[AC_TRY_RUN([#include <stdlib.h>
++int find_stack_direction ()
+ {
+ static char *addr = 0;
+ auto char dummy;
+@@ -1582,6 +1564,8 @@ AC_DEFUN(AC_FUNC_UTIME_NULL,
# Sequent interprets utime(file, 0) to mean use start of epoch. Wrong.
AC_TRY_RUN([#include <sys/types.h>
#include <sys/stat.h>
+#include <stdlib.h>
++#include <utime.h>
int main(void) {
struct stat s, t;
exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
-@@ -1598,6 +1575,7 @@ fi
+@@ -1598,6 +1582,7 @@ fi
AC_DEFUN(AC_FUNC_STRCOLL,
[AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
[AC_TRY_RUN([#include <string.h>
@@ -185,7 +218,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
int main (void)
{
exit (strcoll ("abc", "def") >= 0 ||
-@@ -1614,6 +1592,7 @@ AC_DEFUN(AC_FUNC_SETVBUF_REVERSED,
+@@ -1614,6 +1599,7 @@ AC_DEFUN(AC_FUNC_SETVBUF_REVERSED,
[AC_CACHE_CHECK(whether setvbuf arguments are reversed,
ac_cv_func_setvbuf_reversed,
[AC_TRY_RUN([#include <stdio.h>
@@ -193,7 +226,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
/* If setvbuf has the reversed format, exit 0. */
int main (void) {
/* This call has the arguments reversed.
-@@ -1646,7 +1625,8 @@ LIBS="-lintl $LIBS"])])])
+@@ -1646,7 +1632,8 @@ LIBS="-lintl $LIBS"])])])
AC_DEFUN(AC_FUNC_MEMCMP,
[AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
@@ -203,7 +236,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
int main(void)
{
char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-@@ -1805,6 +1785,7 @@ AC_TRY_RUN(
+@@ -1805,6 +1792,7 @@ AC_TRY_RUN(
#if !defined(__STDC__) || __STDC__ != 1
#define volatile
#endif
@@ -211,7 +244,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
int main(void) {
volatile char c = 255; exit(c < 0);
}], ac_cv_c_char_unsigned=yes, ac_cv_c_char_unsigned=no)
-@@ -1819,7 +1800,8 @@ AC_DEFUN(AC_C_LONG_DOUBLE,
+@@ -1819,7 +1807,8 @@ AC_DEFUN(AC_C_LONG_DOUBLE,
[if test "$GCC" = yes; then
ac_cv_c_long_double=yes
else
@@ -221,7 +254,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
/* The Stardent Vistra knows sizeof(long double), but does not support it. */
long double foo = 0.0;
/* On Ultrix 4.3 cc, long double is 4 and double is 8. */
-@@ -1834,7 +1816,8 @@ fi
+@@ -1834,7 +1823,8 @@ fi
AC_DEFUN(AC_INT_16_BITS,
[AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl
AC_MSG_CHECKING(whether int is 16 bits)
@@ -231,7 +264,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
[AC_MSG_RESULT(yes)
AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
])
-@@ -1842,7 +1825,8 @@ AC_TRY_RUN([int main(void) { exit(sizeof(int) != 2); }],
+@@ -1842,7 +1832,8 @@ AC_TRY_RUN([int main(void) { exit(sizeof(int) != 2); }],
AC_DEFUN(AC_LONG_64_BITS,
[AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl
AC_MSG_CHECKING(whether long int is 64 bits)
@@ -241,3 +274,24 @@ Signed-off-by: Sam James <sam@gentoo.org>
[AC_MSG_RESULT(yes)
AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
])
+@@ -1862,7 +1853,8 @@ AC_TRY_COMPILE([#include <sys/types.h>
+ not big endian
+ #endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
+ if test $ac_cv_c_bigendian = unknown; then
+-AC_TRY_RUN([int main (void) {
++AC_TRY_RUN([#include <stdlib.h>
++int main (void) {
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+@@ -2275,7 +2267,10 @@ AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS,
+ i.e. the pid of the child, which means that wait was restarted
+ after getting the signal. */
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <signal.h>
++#include <stdlib.h>
++#include <unistd.h>
+ ucatch (isig) { }
+ int main (void) {
+ int i = fork (), status;
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2022-11-03 22:57 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-11-03 22:57 UTC (permalink / raw
To: gentoo-commits
commit: b446ad51f453add53fee8b8c0534d06f8b24d5fe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 22:56:36 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 22:56:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b446ad51
sys-devel/autoconf: one more Clang 16 fix for autoconf 2.13
Thanks to matsl again :)
Bug: https://bugs.gentoo.org/874366
See: d172fe309bd90487b1f61a106efd2a8b68f10367
See: c305a45884a8f01838d6e032f469d7f9423154e1
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../autoconf/{autoconf-2.13-r5.ebuild => autoconf-2.13-r6.ebuild} | 0
.../files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch | 8 +++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.13-r5.ebuild b/sys-devel/autoconf/autoconf-2.13-r6.ebuild
similarity index 100%
rename from sys-devel/autoconf/autoconf-2.13-r5.ebuild
rename to sys-devel/autoconf/autoconf-2.13-r6.ebuild
diff --git a/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch b/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
index 55eda96241ab..98c054a05e2d 100644
--- a/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
+++ b/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
@@ -1,4 +1,4 @@
-From 42a47ba46cacb85dfcf6efdba372a3eb3995a844 Mon Sep 17 00:00:00 2001
+From 682ddd135d66d2d379efc0b044de50cc39489fde Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 3 Nov 2022 01:19:39 +0000
Subject: [PATCH] Clang 16 fixes for various tests
@@ -12,14 +12,16 @@ Bug: https://bugs.gentoo.org/874366
Signed-off-by: Sam James <sam@gentoo.org>
--- a/acgeneral.m4
+++ b/acgeneral.m4
-@@ -1988,6 +1988,7 @@ changequote([, ])dnl
+@@ -1988,7 +1988,8 @@ changequote([, ])dnl
AC_MSG_CHECKING(size of $1)
AC_CACHE_VAL(AC_CV_NAME,
[AC_TRY_RUN([#include <stdio.h>
+-main(void)
+#include <stdlib.h>
- main(void)
++int main(void)
{
FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -706,6 +706,7 @@ fi
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2022-11-09 8:30 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-11-09 8:30 UTC (permalink / raw
To: gentoo-commits
commit: 076ee2e058cc932dee7e4d9cf61547287b3c3630
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 9 08:29:22 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 9 08:29:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076ee2e0
sys-devel/autoconf: one more Clang 16 fix for autoconf 2.13
Thanks to matsl again again!
Bug: https://bugs.gentoo.org/874366
See: b446ad51f453add53fee8b8c0534d06f8b24d5fe
See: d172fe309bd90487b1f61a106efd2a8b68f10367
See: c305a45884a8f01838d6e032f469d7f9423154e1
Signed-off-by: Sam James <sam <AT> gentoo.org>
...conf-2.13-r6.ebuild => autoconf-2.13-r7.ebuild} | 0
...onf-2.13-Clang-16-fixes-for-various-tests.patch | 38 ++++++++++++++++++++--
2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.13-r6.ebuild b/sys-devel/autoconf/autoconf-2.13-r7.ebuild
similarity index 100%
rename from sys-devel/autoconf/autoconf-2.13-r6.ebuild
rename to sys-devel/autoconf/autoconf-2.13-r7.ebuild
diff --git a/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch b/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
index 98c054a05e2d..d158f7974e81 100644
--- a/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
+++ b/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
@@ -1,6 +1,6 @@
-From 682ddd135d66d2d379efc0b044de50cc39489fde Mon Sep 17 00:00:00 2001
+From cb92e8110d1f274b28d5c156a93c525d2b748644 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
-Date: Thu, 3 Nov 2022 01:19:39 +0000
+Date: Wed, 9 Nov 2022 08:27:53 +0000
Subject: [PATCH] Clang 16 fixes for various tests
Fixes -Wimplicit-int and -Wimplicit-function-declaration
@@ -24,6 +24,15 @@ Signed-off-by: Sam James <sam@gentoo.org>
if (!f) exit(1);
--- a/acspecific.m4
+++ b/acspecific.m4
+@@ -371,7 +371,7 @@ changequote(, )dnl
+ sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
+ changequote([, ])dnl
+ AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
+-[echo 'foo(void){}' > conftest.c
++[echo 'int foo(void){}' > conftest.c
+ # Make sure it works both with $CC and with simple cc.
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
@@ -706,6 +706,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -175,7 +184,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-@@ -1270,7 +1249,7 @@ AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
+@@ -1270,11 +1249,11 @@ AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
but some compilers (e.g. gcc -O) don't grok <vfork.h>.
Test for this by using a static variable whose address
is put into a register that is clobbered by the vfork. */
@@ -184,6 +193,11 @@ Signed-off-by: Sam James <sam@gentoo.org>
#ifdef __cplusplus
sparc_address_test (int arg)
#else
+-sparc_address_test (arg) int arg;
++sparc_address_test (int arg)
+ #endif
+ {
+ static pid_t child;
@@ -1359,6 +1338,8 @@ AC_DEFUN(AC_FUNC_WAIT3,
#include <sys/time.h>
#include <sys/resource.h>
@@ -286,6 +300,15 @@ Signed-off-by: Sam James <sam@gentoo.org>
/* Are we little or big endian? From Harbison&Steele. */
union
{
+@@ -1885,7 +1877,7 @@ AC_DEFUN(AC_C_INLINE,
+ [AC_CACHE_CHECK([for inline], ac_cv_c_inline,
+ [ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+- AC_TRY_COMPILE(, [} $ac_kw foo(void) {], [ac_cv_c_inline=$ac_kw; break])
++ AC_TRY_COMPILE(, [} $ac_kw int foo(void) {], [ac_cv_c_inline=$ac_kw; break])
+ done
+ ])
+ case "$ac_cv_c_inline" in
@@ -2275,7 +2267,10 @@ AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS,
i.e. the pid of the child, which means that wait was restarted
after getting the signal. */
@@ -297,3 +320,12 @@ Signed-off-by: Sam James <sam@gentoo.org>
ucatch (isig) { }
int main (void) {
int i = fork (), status;
+@@ -2444,7 +2439,7 @@ if test "$ac_x_libraries" = NO; then
+ # Don't add to $LIBS permanently.
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$x_direct_test_library $LIBS"
+-AC_TRY_LINK(, [${x_direct_test_function}()],
++AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(0)],
+ [LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+ ac_x_libraries=],
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
@ 2023-07-17 20:23 Andreas K. Hüttel
0 siblings, 0 replies; 15+ messages in thread
From: Andreas K. Hüttel @ 2023-07-17 20:23 UTC (permalink / raw
To: gentoo-commits
commit: e063ee3b134e9a6ed54925621d3299b93c6a7387
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 20:22:35 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 20:23:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e063ee3b
sys-devel/autoconf: 2.71-r7 with two more bugfix backports
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-devel/autoconf/autoconf-2.71-r7.ebuild | 90 ++++++++++++++++++++++
.../autoconf/files/autoconf-2.71-bash52.patch | 65 ++++++++++++++++
.../autoconf/files/autoconf-2.71-cxx11typo.patch | 31 ++++++++
3 files changed, 186 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.71-r7.ebuild b/sys-devel/autoconf/autoconf-2.71-r7.ebuild
new file mode 100644
index 000000000000..db7dca39d2e7
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.71-r7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+ inherit git-r3
+else
+ # For _beta handling replace with real version number
+ MY_PV="${PV}"
+ MY_P="${PN}-${MY_PV}"
+ #PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
+ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+ https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ #SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
+
+ if ! [[ ${PV} == *_beta* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ fi
+ S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3+"
+SLOT="${PV/_*}"
+IUSE="emacs"
+
+# for 2.71, our Perl time resolution patch changes our min Perl from 5.6
+# (vanilla upstream for 2.71) to 5.8.
+BDEPEND=">=sys-devel/m4-1.4.16
+ >=dev-lang/perl-5.8"
+RDEPEND="${BDEPEND}
+ >=sys-devel/autoconf-wrapper-15
+ sys-devel/gnuconfig
+ !~sys-devel/${P}:2.5"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-AC_LANG_CALL_C_cxx.patch
+ "${FILESDIR}"/${P}-time.patch
+ "${FILESDIR}"/${P}-AC_C_BIGENDIAN-lto.patch
+ "${FILESDIR}"/${P}-K-R-decls-clang.patch
+ "${FILESDIR}"/${P}-make-4.4.patch
+ "${FILESDIR}"/${P}-K-R-decls-clang-deux.patch
+ "${FILESDIR}"/${P}-cxx11typo.patch
+ "${FILESDIR}"/${P}-bash52.patch
+)
+
+src_prepare() {
+ # usr/bin/libtool is provided by binutils-apple, need gnu libtool
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
+ fi
+
+ # Save timestamp to avoid later makeinfo call
+ touch -r doc/{,old_}autoconf.texi || die
+
+ local pdir
+ for pdir in "${WORKDIR}"/{upstream_,}patches ; do
+ if [[ -d "${pdir}" ]] ; then
+ eapply ${pdir}
+ fi
+ done
+
+ toolchain-autoconf_src_prepare
+
+ # Restore timestamp to avoid makeinfo call
+ # We already have an up to date autoconf.info page at this point.
+ touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ toolchain-autoconf_src_install
+
+ local f
+ for f in config.{guess,sub} ; do
+ ln -fs ../../gnuconfig/${f} \
+ "${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+ done
+}
diff --git a/sys-devel/autoconf/files/autoconf-2.71-bash52.patch b/sys-devel/autoconf/files/autoconf-2.71-bash52.patch
new file mode 100644
index 000000000000..1c3c91db1d4f
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-bash52.patch
@@ -0,0 +1,65 @@
+From 412166e185c00d6eacbe67dfcb0326f622ec4020 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Fri, 30 Sep 2022 11:36:03 -0400
+Subject: [PATCH] Fix testsuite failures with bash 5.2.
+
+Bash v5.2 includes several new optimizations to the number of
+subshells used for various constructs; as a side effect, the value of
+SHLVL is less stable than it used to be. Add SHLVL to the list of
+built-in shell variables with unstable values, to be ignored when
+checking for inappropriate differences to the shell environment
+before and after a macro invocation / between two configure runs.
+
+Problem and solution reported by Xi Ruoyao in
+https://lists.gnu.org/archive/html/autoconf/2022-09/msg00015.html
+Problem also reported by Bruce Dubbs in
+https://lists.gnu.org/archive/html/bug-autoconf/2022-09/msg00010.html
+
+* tests/local.at (_AT_CHECK_ENV, AT_CONFIG_CMP): Ignore changes in
+ value of SHLVL.
+Copyright-paperwork-exempt: yes
+---
+ tests/local.at | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/local.at b/tests/local.at
+index 193fd118..a9cf4050 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -352,7 +352,7 @@ m4_define([AT_CHECK_CONFIGURE],
+ # - AC_SUBST'ed variables
+ # (FIXME: Generate a list of these automatically.)
+ # - _|@|.[*#?$].|argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS
+-# |START_TIME|ToD|_AST_FEATURES
++# |SHLVL|START_TIME|ToD|_AST_FEATURES
+ # Some variables some shells use and change.
+ # '.[*#?$].' catches '$#' etc. which are displayed like this:
+ # | '!'=18186
+@@ -404,7 +404,7 @@ if test -f state-env.before && test -f state-env.after; then
+ [GREP|[EF]GREP|SED],
+ [[_@]|.[*@%:@?$].],
+ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM],
+- [SECONDS|START_TIME|ToD|_AST_FEATURES]))=' \
++ [SECONDS|SHLVL|START_TIME|ToD|_AST_FEATURES]))=' \
+ $act_file ||
+ test $? -eq 1 || echo failed >&2
+ ) 2>stderr-$act_file |
+@@ -435,6 +435,7 @@ fi
+ # - PPID [bash, zsh]
+ # - RANDOM [bash, zsh]
+ # - SECONDS [bash, zsh]
++# - SHLVL [bash]
+ # - START_TIME [NetBSD sh]
+ # - ToD [NetBSD sh]
+ # - '$' [zsh]
+@@ -483,6 +484,7 @@ do
+ /^PPID=/ d
+ /^RANDOM=/ d
+ /^SECONDS=/ d
++ /^SHLVL=/ d
+ /^START_TIME=/ d
+ /^ToD=/ d
+ /'\'\\\$\''=/ d
+--
+2.39.3
+
diff --git a/sys-devel/autoconf/files/autoconf-2.71-cxx11typo.patch b/sys-devel/autoconf/files/autoconf-2.71-cxx11typo.patch
new file mode 100644
index 000000000000..ed3f68ea2b9e
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-cxx11typo.patch
@@ -0,0 +1,31 @@
+From f460883035ef849a2248b1713f711292ec19f4f0 Mon Sep 17 00:00:00 2001
+From: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
+Date: Fri, 14 May 2021 09:06:20 +0300
+Subject: [PATCH] _AC_PROG_CXX_STDCXX_EDITION_TRY: fix typo in variable name
+
+The typo causes "ac_prog_cxx_stdcxx" to be always set to "cxx11",
+regardless of whether the C++ compiler supports C++11.
+Message-Id: <YJ4TXAeJcvU0oSec@FSAPPLE2215.fi.f-secure.com>
+(tiny change)
+---
+ lib/autoconf/c.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
+index 9f881f0b..47434c89 100644
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -2749,8 +2749,8 @@ AC_DEFUN([_AC_PROG_CXX_STDCXX_EDITION_TRY],
+ [AC_REQUIRE([_AC_CXX_CXX$1_TEST_PROGRAM])]dnl
+ [AS_IF([test x$ac_prog_cxx_stdcxx = xno],
+ [AC_MSG_CHECKING([for $CXX option to enable C++$1 features])
+-AC_CACHE_VAL(ac_cv_prog_cxx_$1,
+-[ac_cv_prog_cxx_$1=no
++AC_CACHE_VAL(ac_cv_prog_cxx_cxx$1,
++[ac_cv_prog_cxx_cxx$1=no
+ ac_save_CXX=$CXX
+ AC_LANG_CONFTEST([AC_LANG_DEFINES_PROVIDED][$][ac_cxx_conftest_cxx$1_program])
+ for ac_arg in '' m4_normalize(m4_defn([_AC_CXX_CXX$1_OPTIONS]))
+--
+2.39.3
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-07-17 20:23 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-03 1:52 [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-07-17 20:23 Andreas K. Hüttel
2022-11-09 8:30 Sam James
2022-11-03 22:57 Sam James
2022-09-19 19:10 Sam James
2022-09-19 16:26 Sam James
2022-09-19 16:26 Sam James
2021-01-28 23:49 Lars Wendler
2020-12-29 16:14 Lars Wendler
2020-10-17 20:00 Lars Wendler
2020-08-29 14:38 Thomas Deutschmann
2018-01-18 9:40 Lars Wendler
2018-01-04 9:35 Lars Wendler
2017-05-13 9:29 Lars Wendler
2017-03-23 14:23 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox