* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2017-04-27 13:42 Lars Wendler
0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2017-04-27 13:42 UTC (permalink / raw
To: gentoo-commits
commit: 50932475bceaaa0499b1d1e0daf78e5e8f7c1446
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 11:40:02 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 13:42:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50932475
sys-devel/autoconf: Add perl-5.26 patch re bug #613790
This fixes the unescaped "{" issue.
-r1 bump necessary as end users must have this patch applied to
their installs otherwise autoscan will be broken after upgrading
perl.
autoconf does not subslot dep on perl, so there are no guarantees
that a rebuild will happen to propagate this patch
Hence, -r1 fix
Bug: https://bugs.gentoo.org/613790
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4500
...conf-2.69-r2.ebuild => autoconf-2.69-r3.ebuild} | 1 +
.../autoconf/files/autoconf-2.69-perl-5.26.patch | 28 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.69-r2.ebuild b/sys-devel/autoconf/autoconf-2.69-r3.ebuild
similarity index 96%
rename from sys-devel/autoconf/autoconf-2.69-r2.ebuild
rename to sys-devel/autoconf/autoconf-2.69-r3.ebuild
index 0acd57e4e77..37354a400d9 100644
--- a/sys-devel/autoconf/autoconf-2.69-r2.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r3.ebuild
@@ -36,5 +36,6 @@ 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 )
toolchain-autoconf_src_prepare
}
diff --git a/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch
new file mode 100644
index 00000000000..b3d7888ca72
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch
@@ -0,0 +1,28 @@
+From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue, 29 Jan 2013 13:46:48 -0800
+Subject: [PATCH] autoscan: port to perl 5.17
+
+* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a
+feature that is deprecated in Perl 5.17. Reported by Ray Lauff in
+<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>.
+---
+ bin/autoscan.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/autoscan.in b/bin/autoscan.in
+index 993a750..db1df79 100644
+--- a/bin/autoscan.in
++++ b/bin/autoscan.in
+@@ -358,7 +358,7 @@ sub scan_sh_file ($)
+ {
+ # Strip out comments and variable references.
+ s/#.*//;
+- s/\${[^\}]*}//g;
++ s/\$\{[^\}]*}//g;
+ s/@[^@]*@//g;
+
+ # Tokens in the code.
+--
+1.9.1
+
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2017-08-04 15:17 Lars Wendler
0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2017-08-04 15:17 UTC (permalink / raw
To: gentoo-commits
commit: 565193ae54cfbf09e592ed5607b3775986d93c53
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 4 15:17:17 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Aug 4 15:17:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565193ae
sys-devel/autoconf: Revbump to add another perl-5.26 fix (bug #625576).
Package-Manager: Portage-2.3.6, Repoman-2.3.3
...conf-2.69-r3.ebuild => autoconf-2.69-r4.ebuild} | 6 +++--
.../autoconf/files/autoconf-2.69-perl-5.26-2.patch | 30 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.69-r3.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
similarity index 94%
rename from sys-devel/autoconf/autoconf-2.69-r3.ebuild
rename to sys-devel/autoconf/autoconf-2.69-r4.ebuild
index 54b5079415c..eac25293936 100644
--- a/sys-devel/autoconf/autoconf-2.69-r3.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
http://git.savannah.gnu.org/r/${PN}.git"
# We need all the tags in order to figure out the right version.
# The git-r3 eclass doesn't support that, so have to stick to 2.
- inherit git-2
+ inherit git-r3
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
@@ -39,6 +39,8 @@ src_prepare() {
PATCHES+=(
"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
"${FILESDIR}"/${P}-fix-libtool-test.patch
+ "${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
)
toolchain-autoconf_src_prepare
+ eapply_user
}
diff --git a/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch
new file mode 100644
index 00000000000..6becf807c43
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/625576
+
+--- autoconf-2.69/bin/autoheader.in
++++ autoconf-2.69/bin/autoheader.in
+@@ -173,6 +173,12 @@
+ # Source what the traces are trying to tell us.
+ verb "$me: running $autoconf to trace from $ARGV[0]";
+ my $quoted_tmp = shell_quote ($tmp);
++my $perl_tmp;
++if ( $tmp =~ /^\// ) {
++ $perl_tmp=$tmp;
++} else {
++ $perl_tmp="./".$tmp;
++}
+ xsystem ("$autoconf"
+ # If you change this list, update the
+ # `Autoheader-preselections' section of autom4te.in.
+@@ -182,9 +188,9 @@
+ . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl");
+
+ local (%verbatim, %symbol);
+-debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`;
+-do "$tmp/traces.pl";
+-warn "couldn't parse $tmp/traces.pl: $@" if $@;
++debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`;
++do "$perl_tmp/traces.pl";
++warn "couldn't parse $perl_tmp/traces.pl: $@" if $@;
+ unless ($config_h)
+ {
+ error "error: AC_CONFIG_HEADERS not found in $ARGV[0]";
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2018-12-22 19:03 Andreas K. Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas K. Hüttel @ 2018-12-22 19:03 UTC (permalink / raw
To: gentoo-commits
commit: 27f80f1f403f17a8dd7fd3108d178adaafda5e80
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 19:02:05 2018 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 19:03:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f80f1f
sys-devel/autoconf: Revision bump 2.13-r1 for Perl 5.26
Only one patch needed, the other one modifies code that does
not exist in this version yet.
Test suite passes in either case, not catching the problem.
Closes: https://bugs.gentoo.org/625576
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../{autoconf-2.13.ebuild => autoconf-2.13-r1.ebuild} | 3 ++-
sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
similarity index 94%
rename from sys-devel/autoconf/autoconf-2.13.ebuild
rename to sys-devel/autoconf/autoconf-2.13-r1.ebuild
index 760263724fb..a908a4d5d6f 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,6 +24,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-destdir.patch
"${FILESDIR}"/${P}-test-fixes.patch #146592
+ "${FILESDIR}"/${PN}-2.13-perl-5.26.patch
)
src_configure() {
diff --git a/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch b/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch
new file mode 100644
index 00000000000..6fbc0cd1bc8
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch
@@ -0,0 +1,12 @@
+diff -ruN autoconf-2.13.orig/autoscan.pl autoconf-2.13/autoscan.pl
+--- autoconf-2.13.orig/autoscan.pl 1999-01-05 14:28:42.000000000 +0100
++++ autoconf-2.13/autoscan.pl 2018-12-22 19:55:10.986732296 +0100
+@@ -232,7 +232,7 @@
+ # Strip out comments and variable references.
+ s/#.*//;
+ s/\$\([^\)]*\)//g;
+- s/\${[^\}]*}//g;
++ s/\$\{[^\}]*}//g;
+ s/@[^@]*@//g;
+
+ # Variable assignments.
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2020-10-21 7:00 Lars Wendler
0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-10-21 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 071cf1ca76377ce19b3f4267327436d36da6df50
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 06:57:45 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 07:00:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071cf1ca
Revert "sys-devel/autoconf: Revbump to improve AC_INIT arg quoting"
This reverts commit c95e99d3956c8d0f6816937107fb0cfeae12366e.
As slyfox reported in bug #750191, this patch breaks AC_INIT for many
packages and thus has not been added to autoconf upstream repo.
Bug: https://bugs.gentoo.org/750191
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
..._beta2-r1.ebuild => autoconf-2.70_beta2.ebuild} | 4 -
...oconf-2.70_beta2-AC_INIT_argument_quoting.patch | 573 ---------------------
2 files changed, 577 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.70_beta2-r1.ebuild b/sys-devel/autoconf/autoconf-2.70_beta2.ebuild
similarity index 96%
rename from sys-devel/autoconf/autoconf-2.70_beta2-r1.ebuild
rename to sys-devel/autoconf/autoconf-2.70_beta2.ebuild
index f5729eca99d..340c2601642 100644
--- a/sys-devel/autoconf/autoconf-2.70_beta2-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70_beta2.ebuild
@@ -33,10 +33,6 @@ 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
deleted file mode 100644
index 8a308c44396..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.70_beta2-AC_INIT_argument_quoting.patch
+++ /dev/null
@@ -1,573 +0,0 @@
-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] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2020-11-11 16:23 Lars Wendler
0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-11-11 16:23 UTC (permalink / raw
To: gentoo-commits
commit: 03d4a0b32ace4d24233110f43966a6aaced57bd5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 16:22:19 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 16:23:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d4a0b3
sys-devel/autoconf: Revbump to avoid aux files versioning
Closes: https://bugs.gentoo.org/753023
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
..._beta3.ebuild => autoconf-2.70_beta3-r1.ebuild} | 5 +
...onf-2.70_beta3-build-aux_avoid_autoreconf.patch | 272 +++++++++++++++++++++
...nf-2.70_beta3-build-aux_no_transform_name.patch | 55 +++++
3 files changed, 332 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.70_beta3.ebuild b/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
similarity index 92%
rename from sys-devel/autoconf/autoconf-2.70_beta3.ebuild
rename to sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
index 5f71692aaf5..e4079a394a2 100644
--- a/sys-devel/autoconf/autoconf-2.70_beta3.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
@@ -33,6 +33,11 @@ RDEPEND="${BDEPEND}
[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+PATCHES=(
+ "${FILESDIR}/${P}-build-aux_no_transform_name.patch" #753023
+ "${FILESDIR}/${P}-build-aux_avoid_autoreconf.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_beta3-build-aux_avoid_autoreconf.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
new file mode 100644
index 00000000000..a884c503d16
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
@@ -0,0 +1,272 @@
+--- autoconf-2.69d/Makefile.in
++++ autoconf-2.69d/Makefile.in
+@@ -221,10 +221,10 @@
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+- $(am__configure_deps) $(dist_buildaux_SCRIPTS) \
+- $(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \
+- $(dist_lisp_LISP) $(dist_autoconflib_DATA) \
+- $(dist_autotestlib_DATA) $(dist_m4sugarlib_DATA) \
++ $(am__configure_deps) $(srcdir)/doc/version.texi \
++ $(srcdir)/doc/stamp-vti $(dist_lisp_LISP) \
++ $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
++ $(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
+ $(dist_perllib_DATA) $(am__DIST_COMMON)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+@@ -258,15 +258,15 @@
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" \
+- "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" \
+- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" \
+- "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" \
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \
++ "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" \
++ "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" \
++ "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" \
+ "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" \
+ "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" \
+ "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" \
+ "$(DESTDIR)$(pkgdatadir)"
+-SCRIPTS = $(bin_SCRIPTS) $(dist_buildaux_SCRIPTS) $(noinst_SCRIPTS)
++SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -341,10 +341,11 @@
+ NROFF = nroff
+ MANS = $(dist_man_MANS)
+ DATA = $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
+- $(dist_m4sugarlib_DATA) $(dist_perllib_DATA) \
+- $(nodist_autoconflib_DATA) $(nodist_autoscanlib_DATA) \
+- $(nodist_autotestlib_DATA) $(nodist_m4sugarlib_DATA) \
+- $(nodist_pkgdata_DATA) $(pkgdata_DATA)
++ $(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
++ $(dist_perllib_DATA) $(nodist_autoconflib_DATA) \
++ $(nodist_autoscanlib_DATA) $(nodist_autotestlib_DATA) \
++ $(nodist_m4sugarlib_DATA) $(nodist_pkgdata_DATA) \
++ $(pkgdata_DATA)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+@@ -754,12 +755,23 @@
+ lib/autotest/specific.m4
+
+ nodist_autotestlib_DATA = lib/autotest/autotest.m4f
+-buildauxdir = $(pkgdatadir)/build-aux
+-dist_buildaux_SCRIPTS = \
++
++# These are declared as _DATA so that they are not subject to
++# --program-transform-name; $(pkgdatadir) is sufficient to keep
++# multiple installations separate, and autoreconf looks for them by
++# their unadorned names. However, autoreconf copies the executable
++# bit when it copies these files into a source tree, and _DATA items
++# are installed as not-executable, so we have to make them executable
++# in a hook rule.
++AUXSCRIPTS = \
+ build-aux/config.guess \
+ build-aux/config.sub \
+ build-aux/install-sh
+
++buildauxdir = $(pkgdatadir)/build-aux
++dist_buildaux_DATA = \
++ $(AUXSCRIPTS)
++
+ dist_man_MANS = \
+ man/autoconf.1 \
+ man/autoheader.1 \
+@@ -994,56 +1006,6 @@
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+ done; \
+ done; rm -f c$${pid}_.???; exit $$bad
+-install-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
+- @$(NORMAL_INSTALL)
+- @list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || list=; \
+- if test -n "$$list"; then \
+- echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
+- $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
+- fi; \
+- for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+- done | \
+- sed -e 'p;s,.*/,,;n' \
+- -e 'h;s|.*|.|' \
+- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+- if (++n[d] == $(am__install_max)) { \
+- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+- else { print "f", d "/" $$4, $$1 } } \
+- END { for (d in files) print "f", d, files[d] }' | \
+- while read type dir files; do \
+- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+- test -z "$$files" || { \
+- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(buildauxdir)$$dir'"; \
+- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(buildauxdir)$$dir" || exit $$?; \
+- } \
+- ; done
+-
+-uninstall-dist_buildauxSCRIPTS:
+- @$(NORMAL_UNINSTALL)
+- @list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || exit 0; \
+- files=`for p in $$list; do echo "$$p"; done | \
+- sed -e 's,.*/,,;$(transform)'`; \
+- dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
+-
+-installcheck-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
+- bad=0; pid=$$$$; list="$(dist_buildaux_SCRIPTS)"; for p in $$list; do \
+- case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+- *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+- esac; \
+- f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
+- for opt in --help --version; do \
+- if "$(DESTDIR)$(buildauxdir)/$$f" $$opt >c$${pid}_.out \
+- 2>c$${pid}_.err </dev/null \
+- && test -n "`cat c$${pid}_.out`" \
+- && test -z "`cat c$${pid}_.err`"; then :; \
+- else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+- done; \
+- done; rm -f c$${pid}_.???; exit $$bad
+ doc/$(am__dirstamp):
+ @$(MKDIR_P) doc
+ @: > doc/$(am__dirstamp)
+@@ -1385,6 +1347,27 @@
+ @list='$(dist_autotestlib_DATA)'; test -n "$(autotestlibdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(autotestlibdir)'; $(am__uninstall_files_from_dir)
++install-dist_buildauxDATA: $(dist_buildaux_DATA)
++ @$(NORMAL_INSTALL)
++ @list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(buildauxdir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(buildauxdir)" || exit $$?; \
++ done
++
++uninstall-dist_buildauxDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
+ install-dist_m4sugarlibDATA: $(dist_m4sugarlib_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(dist_m4sugarlib_DATA)'; test -n "$(m4sugarlibdir)" || list=; \
+@@ -1794,7 +1777,7 @@
+ all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(LISP) $(ELCFILES) $(MANS) \
+ $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+@@ -1858,13 +1841,14 @@
+ info-am: $(INFO_DEPS)
+
+ install-data-am: install-dist_autoconflibDATA \
+- install-dist_autotestlibDATA install-dist_buildauxSCRIPTS \
++ install-dist_autotestlibDATA install-dist_buildauxDATA \
+ install-dist_lispLISP install-dist_m4sugarlibDATA \
+ install-dist_perllibDATA install-info-am install-man \
+ install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
+ install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
+ install-nodist_pkgdataDATA install-pkgdataDATA
+-
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am
+
+ install-dvi-am: $(DVIS)
+@@ -1980,8 +1964,7 @@
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
+-installcheck-am: installcheck-binSCRIPTS \
+- installcheck-dist_buildauxSCRIPTS installcheck-local
++installcheck-am: installcheck-binSCRIPTS installcheck-local
+
+ maintainer-clean: maintainer-clean-am
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+@@ -2003,7 +1986,7 @@
+ ps-am: $(PSS)
+
+ uninstall-am: uninstall-binSCRIPTS uninstall-dist_autoconflibDATA \
+- uninstall-dist_autotestlibDATA uninstall-dist_buildauxSCRIPTS \
++ uninstall-dist_autotestlibDATA uninstall-dist_buildauxDATA \
+ uninstall-dist_lispLISP uninstall-dist_m4sugarlibDATA \
+ uninstall-dist_perllibDATA uninstall-dvi-am uninstall-html-am \
+ uninstall-info-am uninstall-man \
+@@ -2015,7 +1998,8 @@
+
+ uninstall-man: uninstall-man1
+
+-.MAKE: all check check-am install install-am install-strip
++.MAKE: all check check-am install install-am install-data-am \
++ install-strip
+
+ .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am \
+ check-local clean clean-aminfo clean-cscope clean-generic \
+@@ -2026,24 +2010,24 @@
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binSCRIPTS install-data install-data-am \
+- install-dist_autoconflibDATA install-dist_autotestlibDATA \
+- install-dist_buildauxSCRIPTS install-dist_lispLISP \
+- install-dist_m4sugarlibDATA install-dist_perllibDATA \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-html install-html-am install-info install-info-am \
+- install-man install-man1 install-nodist_autoconflibDATA \
+- install-nodist_autoscanlibDATA install-nodist_autotestlibDATA \
+- install-nodist_m4sugarlibDATA install-nodist_pkgdataDATA \
+- install-pdf install-pdf-am install-pkgdataDATA install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
+- installcheck-binSCRIPTS installcheck-dist_buildauxSCRIPTS \
++ install-data-hook install-dist_autoconflibDATA \
++ install-dist_autotestlibDATA install-dist_buildauxDATA \
++ install-dist_lispLISP install-dist_m4sugarlibDATA \
++ install-dist_perllibDATA install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-man1 \
++ install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
++ install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
++ install-nodist_pkgdataDATA install-pdf install-pdf-am \
++ install-pkgdataDATA install-ps install-ps-am install-strip \
++ installcheck installcheck-am installcheck-binSCRIPTS \
+ installcheck-local installdirs maintainer-clean \
+ maintainer-clean-aminfo maintainer-clean-generic \
+ maintainer-clean-vti mostlyclean mostlyclean-aminfo \
+ mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am tags \
+ tags-am uninstall uninstall-am uninstall-binSCRIPTS \
+ uninstall-dist_autoconflibDATA uninstall-dist_autotestlibDATA \
+- uninstall-dist_buildauxSCRIPTS uninstall-dist_lispLISP \
++ uninstall-dist_buildauxDATA uninstall-dist_lispLISP \
+ uninstall-dist_m4sugarlibDATA uninstall-dist_perllibDATA \
+ uninstall-dvi-am uninstall-html-am uninstall-info-am \
+ uninstall-man uninstall-man1 uninstall-nodist_autoconflibDATA \
+@@ -2200,6 +2184,14 @@
+
+ lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
+
++install-data-hook: install-data-hook-make-aux-scripts-executable
++install-data-hook-make-aux-scripts-executable:
++ for s in $(AUXSCRIPTS); do \
++ chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
++ done
++
++.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
++
+ man/autoconf.1: $(common_dep) man/autoconf.w man/autoconf.x $(binsrcdir)/autoconf.as
+ man/autoheader.1: $(common_dep) man/autoheader.w man/autoheader.x $(binsrcdir)/autoheader.in
+ man/autom4te.1: $(common_dep) man/autom4te.w man/autom4te.x $(binsrcdir)/autom4te.in
diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
new file mode 100644
index 00000000000..079fa15306c
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
@@ -0,0 +1,55 @@
+From 0f7e5a5477f97b8a105d563bc7590ebefaff854d Mon Sep 17 00:00:00 2001
+From: Zack Weinberg <zackw@panix.com>
+Date: Thu, 5 Nov 2020 10:19:26 -0500
+Subject: Do not apply --program-transform-name to build-aux scripts.
+
+autoreconf expects to find $(pkgdatadir)/build-aux/config.sub etc
+under those names, not names modified by --program-transform-name.
+Placing them in $(pkgdatadir) is sufficient to keep parallel
+installations of autoconf separate: anyone doing that would need
+to adjust @PACKAGE@ anyway.
+
+* lib/local.mk: Use a _DATA rule, not a _SCRIPTS rule, to install
+ config.guess, config.sub, and install-sh.
+ (install-data-hook-make-aux-scripts-executable): New hook rule.
+---
+ lib/local.mk | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/lib/local.mk b/lib/local.mk
+index d4ecf3cb..e380403f 100644
+--- a/lib/local.mk
++++ b/lib/local.mk
+@@ -201,8 +201,27 @@ lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
+ ## Install auxiliary scripts. ##
+ ## --------------------------- ##
+
+-buildauxdir = $(pkgdatadir)/build-aux
+-dist_buildaux_SCRIPTS = \
++# These are declared as _DATA so that they are not subject to
++# --program-transform-name; $(pkgdatadir) is sufficient to keep
++# multiple installations separate, and autoreconf looks for them by
++# their unadorned names. However, autoreconf copies the executable
++# bit when it copies these files into a source tree, and _DATA items
++# are installed as not-executable, so we have to make them executable
++# in a hook rule.
++
++AUXSCRIPTS = \
+ build-aux/config.guess \
+ build-aux/config.sub \
+ build-aux/install-sh
++
++buildauxdir = $(pkgdatadir)/build-aux
++dist_buildaux_DATA = \
++ $(AUXSCRIPTS)
++
++install-data-hook: install-data-hook-make-aux-scripts-executable
++install-data-hook-make-aux-scripts-executable:
++ for s in $(AUXSCRIPTS); do \
++ chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
++ done
++
++.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
+--
+cgit v1.2.1
+
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2020-12-01 17:19 Lars Wendler
0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-12-01 17:19 UTC (permalink / raw
To: gentoo-commits
commit: d52505d7ed450c7292d5528602e70a9bbb64ac0b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 1 17:16:23 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 17:19:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52505d7
sys-devel/autoconf: Bump to version 2.70_beta3. Removed old
This is called autoconf-2.69e by upstream
Bug: https://bugs.gentoo.org/732648
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/autoconf/Manifest | 2 +-
..._beta3-r1.ebuild => autoconf-2.70_beta4.ebuild} | 7 +-
...onf-2.70_beta3-build-aux_avoid_autoreconf.patch | 272 ---------------------
...nf-2.70_beta3-build-aux_no_transform_name.patch | 55 -----
4 files changed, 2 insertions(+), 334 deletions(-)
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 32abaa96df9..af16f06d7dd 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -2,4 +2,4 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b07
DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-DIST autoconf-2.70_beta3.tar.xz 1321512 BLAKE2B 92dca4fbd6c247a3b3383289e1a2d6c127f5a333969b8a7051f98adfbe080e702c90b3001dde4759a84c89d5e7ccd7991e509492533a8753fd299aaa46080f1a SHA512 d825d9ce7501f0dfa667ad220339a1668c9472f0601a0ec7dac109af994cacfc2ce49dd01c478a47c7c25f98ba3726c735f1e7002e7b4da71451799f742a2eb1
+DIST autoconf-2.70_beta4.tar.xz 1338832 BLAKE2B 20c801e67d5aa811f0ae18dd0b5f90b843f017a584387a655541215e29f65b2c1e0145d3f436f9a9b9a5f5e35c94e52ed865e0db5b3b0c36c0e6f312e504b6e5 SHA512 e4de63c8be4736a3f864c75d3175b190067a543013935d1be1448060502c1f4c45258619dbf5d80ece96d8a0b5754a664ed084359234a427a3a08082ce12f1af
diff --git a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild
similarity index 91%
rename from sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
rename to sys-devel/autoconf/autoconf-2.70_beta4.ebuild
index e4079a394a2..107821eaccb 100644
--- a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
inherit git-r3
else
- MY_PV="2.69d"
+ MY_PV="2.69e"
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"
@@ -33,11 +33,6 @@ RDEPEND="${BDEPEND}
[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
PDEPEND="emacs? ( app-emacs/autoconf-mode )"
-PATCHES=(
- "${FILESDIR}/${P}-build-aux_no_transform_name.patch" #753023
- "${FILESDIR}/${P}-build-aux_avoid_autoreconf.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_beta3-build-aux_avoid_autoreconf.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
deleted file mode 100644
index a884c503d16..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
+++ /dev/null
@@ -1,272 +0,0 @@
---- autoconf-2.69d/Makefile.in
-+++ autoconf-2.69d/Makefile.in
-@@ -221,10 +221,10 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-- $(am__configure_deps) $(dist_buildaux_SCRIPTS) \
-- $(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \
-- $(dist_lisp_LISP) $(dist_autoconflib_DATA) \
-- $(dist_autotestlib_DATA) $(dist_m4sugarlib_DATA) \
-+ $(am__configure_deps) $(srcdir)/doc/version.texi \
-+ $(srcdir)/doc/stamp-vti $(dist_lisp_LISP) \
-+ $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
-+ $(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
- $(dist_perllib_DATA) $(am__DIST_COMMON)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-@@ -258,15 +258,15 @@
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
--am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" \
-- "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" \
-- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" \
-- "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" \
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \
-+ "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" \
-+ "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" \
-+ "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" \
- "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" \
- "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" \
- "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" \
- "$(DESTDIR)$(pkgdatadir)"
--SCRIPTS = $(bin_SCRIPTS) $(dist_buildaux_SCRIPTS) $(noinst_SCRIPTS)
-+SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -341,10 +341,11 @@
- NROFF = nroff
- MANS = $(dist_man_MANS)
- DATA = $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
-- $(dist_m4sugarlib_DATA) $(dist_perllib_DATA) \
-- $(nodist_autoconflib_DATA) $(nodist_autoscanlib_DATA) \
-- $(nodist_autotestlib_DATA) $(nodist_m4sugarlib_DATA) \
-- $(nodist_pkgdata_DATA) $(pkgdata_DATA)
-+ $(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
-+ $(dist_perllib_DATA) $(nodist_autoconflib_DATA) \
-+ $(nodist_autoscanlib_DATA) $(nodist_autotestlib_DATA) \
-+ $(nodist_m4sugarlib_DATA) $(nodist_pkgdata_DATA) \
-+ $(pkgdata_DATA)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
- # Read a list of newline-separated strings from the standard input,
- # and print each of them once, without duplicates. Input order is
-@@ -754,12 +755,23 @@
- lib/autotest/specific.m4
-
- nodist_autotestlib_DATA = lib/autotest/autotest.m4f
--buildauxdir = $(pkgdatadir)/build-aux
--dist_buildaux_SCRIPTS = \
-+
-+# These are declared as _DATA so that they are not subject to
-+# --program-transform-name; $(pkgdatadir) is sufficient to keep
-+# multiple installations separate, and autoreconf looks for them by
-+# their unadorned names. However, autoreconf copies the executable
-+# bit when it copies these files into a source tree, and _DATA items
-+# are installed as not-executable, so we have to make them executable
-+# in a hook rule.
-+AUXSCRIPTS = \
- build-aux/config.guess \
- build-aux/config.sub \
- build-aux/install-sh
-
-+buildauxdir = $(pkgdatadir)/build-aux
-+dist_buildaux_DATA = \
-+ $(AUXSCRIPTS)
-+
- dist_man_MANS = \
- man/autoconf.1 \
- man/autoheader.1 \
-@@ -994,56 +1006,6 @@
- else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
- done; \
- done; rm -f c$${pid}_.???; exit $$bad
--install-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
-- @$(NORMAL_INSTALL)
-- @list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || list=; \
-- if test -n "$$list"; then \
-- echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
-- $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
-- fi; \
-- for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-- done | \
-- sed -e 'p;s,.*/,,;n' \
-- -e 'h;s|.*|.|' \
-- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-- if (++n[d] == $(am__install_max)) { \
-- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-- else { print "f", d "/" $$4, $$1 } } \
-- END { for (d in files) print "f", d, files[d] }' | \
-- while read type dir files; do \
-- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-- test -z "$$files" || { \
-- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(buildauxdir)$$dir'"; \
-- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(buildauxdir)$$dir" || exit $$?; \
-- } \
-- ; done
--
--uninstall-dist_buildauxSCRIPTS:
-- @$(NORMAL_UNINSTALL)
-- @list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || exit 0; \
-- files=`for p in $$list; do echo "$$p"; done | \
-- sed -e 's,.*/,,;$(transform)'`; \
-- dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
--
--installcheck-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
-- bad=0; pid=$$$$; list="$(dist_buildaux_SCRIPTS)"; for p in $$list; do \
-- case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
-- *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
-- esac; \
-- f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
-- for opt in --help --version; do \
-- if "$(DESTDIR)$(buildauxdir)/$$f" $$opt >c$${pid}_.out \
-- 2>c$${pid}_.err </dev/null \
-- && test -n "`cat c$${pid}_.out`" \
-- && test -z "`cat c$${pid}_.err`"; then :; \
-- else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-- done; \
-- done; rm -f c$${pid}_.???; exit $$bad
- doc/$(am__dirstamp):
- @$(MKDIR_P) doc
- @: > doc/$(am__dirstamp)
-@@ -1385,6 +1347,27 @@
- @list='$(dist_autotestlib_DATA)'; test -n "$(autotestlibdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(autotestlibdir)'; $(am__uninstall_files_from_dir)
-+install-dist_buildauxDATA: $(dist_buildaux_DATA)
-+ @$(NORMAL_INSTALL)
-+ @list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
-+ if test -n "$$list"; then \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
-+ fi; \
-+ for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(buildauxdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(buildauxdir)" || exit $$?; \
-+ done
-+
-+uninstall-dist_buildauxDATA:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
- install-dist_m4sugarlibDATA: $(dist_m4sugarlib_DATA)
- @$(NORMAL_INSTALL)
- @list='$(dist_m4sugarlib_DATA)'; test -n "$(m4sugarlibdir)" || list=; \
-@@ -1794,7 +1777,7 @@
- all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(LISP) $(ELCFILES) $(MANS) \
- $(DATA)
- installdirs:
-- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
-+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: $(BUILT_SOURCES)
-@@ -1858,13 +1841,14 @@
- info-am: $(INFO_DEPS)
-
- install-data-am: install-dist_autoconflibDATA \
-- install-dist_autotestlibDATA install-dist_buildauxSCRIPTS \
-+ install-dist_autotestlibDATA install-dist_buildauxDATA \
- install-dist_lispLISP install-dist_m4sugarlibDATA \
- install-dist_perllibDATA install-info-am install-man \
- install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
- install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
- install-nodist_pkgdataDATA install-pkgdataDATA
--
-+ @$(NORMAL_INSTALL)
-+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am
-
- install-dvi-am: $(DVIS)
-@@ -1980,8 +1964,7 @@
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
--installcheck-am: installcheck-binSCRIPTS \
-- installcheck-dist_buildauxSCRIPTS installcheck-local
-+installcheck-am: installcheck-binSCRIPTS installcheck-local
-
- maintainer-clean: maintainer-clean-am
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-@@ -2003,7 +1986,7 @@
- ps-am: $(PSS)
-
- uninstall-am: uninstall-binSCRIPTS uninstall-dist_autoconflibDATA \
-- uninstall-dist_autotestlibDATA uninstall-dist_buildauxSCRIPTS \
-+ uninstall-dist_autotestlibDATA uninstall-dist_buildauxDATA \
- uninstall-dist_lispLISP uninstall-dist_m4sugarlibDATA \
- uninstall-dist_perllibDATA uninstall-dvi-am uninstall-html-am \
- uninstall-info-am uninstall-man \
-@@ -2015,7 +1998,8 @@
-
- uninstall-man: uninstall-man1
-
--.MAKE: all check check-am install install-am install-strip
-+.MAKE: all check check-am install install-am install-data-am \
-+ install-strip
-
- .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am \
- check-local clean clean-aminfo clean-cscope clean-generic \
-@@ -2026,24 +2010,24 @@
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binSCRIPTS install-data install-data-am \
-- install-dist_autoconflibDATA install-dist_autotestlibDATA \
-- install-dist_buildauxSCRIPTS install-dist_lispLISP \
-- install-dist_m4sugarlibDATA install-dist_perllibDATA \
-- install-dvi install-dvi-am install-exec install-exec-am \
-- install-html install-html-am install-info install-info-am \
-- install-man install-man1 install-nodist_autoconflibDATA \
-- install-nodist_autoscanlibDATA install-nodist_autotestlibDATA \
-- install-nodist_m4sugarlibDATA install-nodist_pkgdataDATA \
-- install-pdf install-pdf-am install-pkgdataDATA install-ps \
-- install-ps-am install-strip installcheck installcheck-am \
-- installcheck-binSCRIPTS installcheck-dist_buildauxSCRIPTS \
-+ install-data-hook install-dist_autoconflibDATA \
-+ install-dist_autotestlibDATA install-dist_buildauxDATA \
-+ install-dist_lispLISP install-dist_m4sugarlibDATA \
-+ install-dist_perllibDATA install-dvi install-dvi-am \
-+ install-exec install-exec-am install-html install-html-am \
-+ install-info install-info-am install-man install-man1 \
-+ install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
-+ install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
-+ install-nodist_pkgdataDATA install-pdf install-pdf-am \
-+ install-pkgdataDATA install-ps install-ps-am install-strip \
-+ installcheck installcheck-am installcheck-binSCRIPTS \
- installcheck-local installdirs maintainer-clean \
- maintainer-clean-aminfo maintainer-clean-generic \
- maintainer-clean-vti mostlyclean mostlyclean-aminfo \
- mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am tags \
- tags-am uninstall uninstall-am uninstall-binSCRIPTS \
- uninstall-dist_autoconflibDATA uninstall-dist_autotestlibDATA \
-- uninstall-dist_buildauxSCRIPTS uninstall-dist_lispLISP \
-+ uninstall-dist_buildauxDATA uninstall-dist_lispLISP \
- uninstall-dist_m4sugarlibDATA uninstall-dist_perllibDATA \
- uninstall-dvi-am uninstall-html-am uninstall-info-am \
- uninstall-man uninstall-man1 uninstall-nodist_autoconflibDATA \
-@@ -2200,6 +2184,14 @@
-
- lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
-
-+install-data-hook: install-data-hook-make-aux-scripts-executable
-+install-data-hook-make-aux-scripts-executable:
-+ for s in $(AUXSCRIPTS); do \
-+ chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
-+ done
-+
-+.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
-+
- man/autoconf.1: $(common_dep) man/autoconf.w man/autoconf.x $(binsrcdir)/autoconf.as
- man/autoheader.1: $(common_dep) man/autoheader.w man/autoheader.x $(binsrcdir)/autoheader.in
- man/autom4te.1: $(common_dep) man/autom4te.w man/autom4te.x $(binsrcdir)/autom4te.in
diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
deleted file mode 100644
index 079fa15306c..00000000000
--- a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0f7e5a5477f97b8a105d563bc7590ebefaff854d Mon Sep 17 00:00:00 2001
-From: Zack Weinberg <zackw@panix.com>
-Date: Thu, 5 Nov 2020 10:19:26 -0500
-Subject: Do not apply --program-transform-name to build-aux scripts.
-
-autoreconf expects to find $(pkgdatadir)/build-aux/config.sub etc
-under those names, not names modified by --program-transform-name.
-Placing them in $(pkgdatadir) is sufficient to keep parallel
-installations of autoconf separate: anyone doing that would need
-to adjust @PACKAGE@ anyway.
-
-* lib/local.mk: Use a _DATA rule, not a _SCRIPTS rule, to install
- config.guess, config.sub, and install-sh.
- (install-data-hook-make-aux-scripts-executable): New hook rule.
----
- lib/local.mk | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/lib/local.mk b/lib/local.mk
-index d4ecf3cb..e380403f 100644
---- a/lib/local.mk
-+++ b/lib/local.mk
-@@ -201,8 +201,27 @@ lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
- ## Install auxiliary scripts. ##
- ## --------------------------- ##
-
--buildauxdir = $(pkgdatadir)/build-aux
--dist_buildaux_SCRIPTS = \
-+# These are declared as _DATA so that they are not subject to
-+# --program-transform-name; $(pkgdatadir) is sufficient to keep
-+# multiple installations separate, and autoreconf looks for them by
-+# their unadorned names. However, autoreconf copies the executable
-+# bit when it copies these files into a source tree, and _DATA items
-+# are installed as not-executable, so we have to make them executable
-+# in a hook rule.
-+
-+AUXSCRIPTS = \
- build-aux/config.guess \
- build-aux/config.sub \
- build-aux/install-sh
-+
-+buildauxdir = $(pkgdatadir)/build-aux
-+dist_buildaux_DATA = \
-+ $(AUXSCRIPTS)
-+
-+install-data-hook: install-data-hook-make-aux-scripts-executable
-+install-data-hook-make-aux-scripts-executable:
-+ for s in $(AUXSCRIPTS); do \
-+ chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
-+ done
-+
-+.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
---
-cgit v1.2.1
-
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2021-03-13 20:08 Aaron Bauman
0 siblings, 0 replies; 13+ messages in thread
From: Aaron Bauman @ 2021-03-13 20:08 UTC (permalink / raw
To: gentoo-commits
commit: c2768b36696fbafe315ae1b3b8b4038dfc7dfc03
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 20:07:44 2021 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 20:07:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2768b36
sys-devel/autoconf: fix patch for Darwin
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
sys-devel/autoconf/autoconf-2.71.ebuild | 2 +-
sys-devel/autoconf/files/autoconf-2.71-darwin.patch | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/sys-devel/autoconf/autoconf-2.71.ebuild b/sys-devel/autoconf/autoconf-2.71.ebuild
index d6187f9fa30..86e89e45086 100644
--- a/sys-devel/autoconf/autoconf-2.71.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71.ebuild
@@ -40,7 +40,7 @@ PDEPEND="emacs? ( app-emacs/autoconf-mode )"
src_prepare() {
# usr/bin/libtool is provided by binutils-apple, need gnu libtool
if [[ ${CHOST} == *-darwin* ]] ; then
- PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+ PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
fi
# Save timestamp to avoid later makeinfo call
diff --git a/sys-devel/autoconf/files/autoconf-2.71-darwin.patch b/sys-devel/autoconf/files/autoconf-2.71-darwin.patch
new file mode 100644
index 00000000000..c122aee4b22
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-darwin.patch
@@ -0,0 +1,11 @@
+--- a/bin/autoreconf.in
++++ b/bin/autoreconf.in
+@@ -122,7 +122,7 @@
+ my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
+ my $automake = $ENV{'AUTOMAKE'} || 'automake';
+ my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
+-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
++my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize';
+ my $intltoolize = $ENV{'INTLTOOLIZE'} || 'intltoolize';
+ my $gtkdocize = $ENV{'GTKDOCIZE'} || 'gtkdocize';
+ my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint';
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2021-08-01 19:44 Andreas K. Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas K. Hüttel @ 2021-08-01 19:44 UTC (permalink / raw
To: gentoo-commits
commit: a27bb196930c2b32f3f24956d902c2849d27d20b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 1 19:44:14 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 1 19:44:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27bb196
sys-devel/autoconf: use Time::HiRes functions, bug 782985
While this solution is perfect for Gentoo, it may not be upstreamable
(since Time::HiRes was introduced in Perl 5.8 and autoconf upstream
insists on supporting Perl 5.6).
Bug: https://bugs.gentoo.org/782985
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-devel/autoconf/autoconf-2.71.ebuild | 2 +
sys-devel/autoconf/files/autoconf-2.71-time.patch | 49 +++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.71.ebuild b/sys-devel/autoconf/autoconf-2.71.ebuild
index 3405416d23c..b142fa3470f 100644
--- a/sys-devel/autoconf/autoconf-2.71.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71.ebuild
@@ -37,6 +37,8 @@ RDEPEND="${BDEPEND}
[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+PATCHES=( "${FILESDIR}/${P}-time.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.71-time.patch b/sys-devel/autoconf/files/autoconf-2.71-time.patch
new file mode 100644
index 00000000000..8ecfe10f40a
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-time.patch
@@ -0,0 +1,49 @@
+From e194b3c7e00429612a9d40e78ea571687fd25b91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sun, 1 Aug 2021 19:07:48 +0200
+Subject: [PATCH] Use stat from Time::HiRes (instead of File::stat)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ lib/Autom4te/FileUtils.pm | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
+index a182031b..27a5fd91 100644
+--- a/lib/Autom4te/FileUtils.pm
++++ b/lib/Autom4te/FileUtils.pm
+@@ -34,12 +34,12 @@ This perl module provides various general purpose file handling functions.
+
+ =cut
+
+-use 5.006;
++use 5.008;
+ use strict;
+ use warnings FATAL => 'all';
+
+ use Exporter;
+-use File::stat;
++use Time::HiRes qw(stat);
+ use IO::File;
+
+ use Autom4te::Channels;
+@@ -115,10 +115,11 @@ sub mtime ($)
+ return 0
+ if $file eq '-' || ! -f $file;
+
+- my $stat = stat ($file)
++ my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
++ $atime,$mtime,$ctime,$blksize,$blocks) = stat ($file)
+ or fatal "cannot stat $file: $!";
+
+- return $stat->mtime;
++ return $mtime;
+ }
+
+
+--
+2.31.1
+
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2022-09-10 0:29 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-09-10 0:29 UTC (permalink / raw
To: gentoo-commits
commit: 54055f7d61bcc77b6c0dae8dd73d7cc6c38ffee0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 00:22:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 00:22:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54055f7d
sys-devel/autoconf: fix build with make-9999 (4.4)
Closes: https://bugs.gentoo.org/869257
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/autoconf/autoconf-2.71-r2.ebuild | 84 ++++++++++++++++++++++
.../autoconf/files/autoconf-2.71-make-4.4.patch | 25 +++++++
2 files changed, 109 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.71-r2.ebuild b/sys-devel/autoconf/autoconf-2.71-r2.ebuild
new file mode 100644
index 000000000000..aa7f260aed6d
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.71-r2.ebuild
@@ -0,0 +1,84 @@
+# 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}-time.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-make-4.4.patch b/sys-devel/autoconf/files/autoconf-2.71-make-4.4.patch
new file mode 100644
index 000000000000..4dcf05996180
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-make-4.4.patch
@@ -0,0 +1,25 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=31f673434ee402258b45e958c88acc8725d82b1a
+https://savannah.gnu.org/bugs/?63040
+https://bugs.gentoo.org/869257
+
+From 31f673434ee402258b45e958c88acc8725d82b1a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Fri, 9 Sep 2022 16:54:11 -0500
+Subject: Port to GNU make 4.4
+
+* cfg.mk (PATH): Assign eagerly, and simplify shell use, avoiding
+use of the shell entirely if PWD is set, as it should be.
+Problem reported by Sergei Trofimovich in:
+https://lists.gnu.org/r/autoconf-patches/2022-09/msg00007.html
+--- a/cfg.mk
++++ b/cfg.mk
+@@ -18,7 +18,7 @@
+ # This file is '-include'd into GNUmakefile.
+
+ # Build with our own versions of these tools, when possible.
+-export PATH = $(shell echo "`pwd`/tests:$$PATH")
++export PATH := $(or $(PWD),$(shell pwd))/tests:$(PATH)
+
+ # Remove the autoreconf-provided INSTALL, so that we regenerate it.
+ _autoreconf = autoreconf -i -v && rm -f INSTALL
+cgit v1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2022-09-19 16:26 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-09-19 16:26 UTC (permalink / raw
To: gentoo-commits
commit: dbcc188c5ef6bc63190cc07c93452652c682f5bb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 16:10:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 16:26:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbcc188c
sys-devel/autoconf: backport K&R decls fix to 2.13
Backport the K&R decls fix to 2.13 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.13-r3.ebuild | 51 +++
.../files/autoconf-2.13-K-R-decls-clang.patch | 346 +++++++++++++++++++++
2 files changed, 397 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.13-r3.ebuild b/sys-devel/autoconf/autoconf-2.13-r3.ebuild
new file mode 100644
index 000000000000..89c4e8c53c6d
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.13-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+ sys-devel/m4
+ dev-lang/perl"
+RDEPEND="${BDEPEND}
+ sys-apps/texinfo
+ >=sys-devel/autoconf-wrapper-13"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-destdir.patch
+ "${FILESDIR}"/${P}-test-fixes.patch #146592
+ "${FILESDIR}"/${P}-perl-5.26.patch
+ "${FILESDIR}"/${P}-K-R-decls-clang.patch
+)
+
+src_configure() {
+ # 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 :(
+ #
+ # need to force locale to C to avoid bugs in the old
+ # configure script breaking the install paths #351982
+ #
+ # force to `awk` so that we don't encode another awk that
+ # happens to currently be installed, but might later be
+ # uninstalled (like mawk). same for m4.
+ ac_cv_path_M4="m4" \
+ ac_cv_prog_AWK="awk" \
+ LC_ALL=C \
+ econf \
+ --exec-prefix="${EPREFIX}"/usr \
+ --bindir="${EPREFIX}"/usr/bin \
+ --program-suffix="-${PV}"
+}
diff --git a/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch b/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch
new file mode 100644
index 000000000000..874712cea102
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch
@@ -0,0 +1,346 @@
+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 d8ad1096be4352c588b9bc1e16b6758f4f32b96a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Mon, 19 Sep 2022 01:38:29 +0200
+Subject: [PATCH] ac{general,specific}: declare void param lists, where apt
+
+--- a/acgeneral.m4
++++ b/acgeneral.m4
+@@ -1542,7 +1542,7 @@ extern "C"
+ ])dnl
+ [/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char $1();
++char $1(void);
+ ]),
+ [$1()],
+ [$2],
+@@ -1597,7 +1597,7 @@ extern "C"
+ ])dnl
+ [/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char $2();
++char $2(void);
+ ])),
+ [$2()],
+ eval "ac_cv_lib_$ac_lib_var=yes",
+@@ -1733,7 +1733,7 @@ dnl [#]line __oline__ "[$]0"
+ [#]line __oline__ "configure"
+ #include "confdefs.h"
+ [$1]
+-int main() {
++int main(void) {
+ [$2]
+ ; return 0; }
+ ])EOF
+@@ -1777,7 +1777,7 @@ dnl [#]line __oline__ "[$]0"
+ [#]line __oline__ "configure"
+ #include "confdefs.h"
+ [$1]
+-int main() {
++int main(void) {
+ [$2]
+ ; return 0; }
+ ])EOF
+@@ -1934,7 +1934,7 @@ extern "C"
+ ])dnl
+ [/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-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
+@@ -1988,7 +1988,7 @@ changequote([, ])dnl
+ AC_MSG_CHECKING(size of $1)
+ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
+-main()
++main(void)
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+--- a/acspecific.m4
++++ b/acspecific.m4
+@@ -202,7 +202,7 @@ AC_DEFUN(AC_PROG_CC_WORKS,
+ [AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_C
+-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
++AC_TRY_COMPILER([int main(void){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_prog_cc_works)
+ if test $ac_cv_prog_cc_works = no; then
+@@ -217,7 +217,7 @@ AC_DEFUN(AC_PROG_CXX_WORKS,
+ [AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+-AC_TRY_COMPILER([int main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
++AC_TRY_COMPILER([int main(void){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_prog_cxx_works)
+ if test $ac_cv_prog_cxx_works = no; then
+@@ -300,7 +300,7 @@ fi])])
+
+ AC_DEFUN(AC_PROG_CC_G,
+ [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
+-[echo 'void f(){}' > conftest.c
++[echo 'void f(void){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+ ac_cv_prog_cc_g=yes
+ else
+@@ -311,7 +311,7 @@ rm -f conftest*
+
+ AC_DEFUN(AC_PROG_CXX_G,
+ [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
+-[echo 'void f(){}' > conftest.cc
++[echo 'void f(void){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+ ac_cv_prog_cxx_g=yes
+ else
+@@ -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(){}' > conftest.c
++[echo '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.
+@@ -709,7 +709,7 @@ AC_TRY_RUN([#include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int main () { int i; for (i = 0; i < 256; i++)
++int main (void) { int i; for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+ exit (0); }
+ ], , ac_cv_header_stdc=no, :)
+@@ -820,7 +820,7 @@ esac
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
+ #include <$ac_header_dirent>
+-int closedir(); main() { exit(closedir(opendir(".")) != 0); }],
++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)])
+ if test $ac_cv_func_closedir_void = yes; then
+ AC_DEFINE(VOID_CLOSEDIR)
+@@ -911,7 +911,7 @@ changequote(<<, >>)dnl
+ #define NGID 256
+ #undef MAX
+ #define MAX(x, y) ((x) > (y) ? (x) : (y))
+-main()
++int main(void)
+ {
+ gid_t gidset[NGID];
+ int i, n;
+@@ -973,7 +973,7 @@ AC_DEFUN(AC_TYPE_SIGNAL,
+ #ifdef __cplusplus
+ extern "C" void (*signal (int, void (*)(int)))(int);
+ #else
+-void (*signal ()) ();
++void (*signal (void)) (void);
+ #endif
+ ],
+ [int i;], ac_cv_type_signal=void, ac_cv_type_signal=int)])
+@@ -989,7 +989,7 @@ AC_DEFUN(AC_FUNC_CLOSEDIR_VOID,
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
+ #include <$ac_header_dirent>
+-int closedir(); main() { exit(closedir(opendir(".")) != 0); }],
++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)])
+ if test $ac_cv_func_closedir_void = yes; then
+ AC_DEFINE(CLOSEDIR_VOID)
+@@ -1001,7 +1001,7 @@ 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([main() { exit (fnmatch ("a*", "abc", 0) != 0); }],
++[AC_TRY_RUN([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
+@@ -1083,11 +1083,11 @@ AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
+ #ifdef __cplusplus
+ extern "C" { void *malloc(unsigned); }
+ #else
+-char *malloc();
++char *malloc(...);
+ #endif
+
+ int
+-main()
++main(void)
+ {
+ char *data, *data2, *data3;
+ int i, pagesize;
+@@ -1172,7 +1172,7 @@ int pid;
+ int pg1, pg2, pg3, pg4;
+ int ng, np, s, child;
+
+-main()
++int main(void)
+ {
+ pid = getpid();
+ pg1 = getpgrp(0);
+@@ -1228,7 +1228,7 @@ AC_TRY_RUN([
+ * If this system has a BSD-style setpgrp, which takes arguments, exit
+ * successfully.
+ */
+-main()
++int main(void)
+ {
+ if (setpgrp(1,1) == -1)
+ exit(0);
+@@ -1291,7 +1291,7 @@ sparc_address_test (arg) int arg;
+ }
+ }
+ }
+-main() {
++int main(void) {
+ pid_t parent = getpid ();
+ pid_t child;
+
+@@ -1360,7 +1360,7 @@ AC_DEFUN(AC_FUNC_WAIT3,
+ #include <sys/resource.h>
+ #include <stdio.h>
+ /* HP-UX has wait3 but does not fill in rusage at all. */
+-main() {
++int main(void) {
+ struct rusage r;
+ int i;
+ /* Use a field that we can force nonzero --
+@@ -1416,7 +1416,7 @@ AC_CACHE_CHECK([for alloca], ac_cv_func_alloca_works,
+ #pragma alloca
+ # else
+ # ifndef alloca /* predefined by HP cc +Olibcalls */
+-char *alloca ();
++char *alloca (...);
+ # endif
+ # endif
+ # endif
+@@ -1464,7 +1464,7 @@ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+ else
+ return (&dummy > addr) ? 1 : -1;
+ }
+-main ()
++int main (void)
+ {
+ exit (find_stack_direction() < 0);
+ }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+@@ -1582,7 +1582,7 @@ 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>
+-main() {
++int main(void) {
+ struct stat s, t;
+ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
+ && stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime
+@@ -1598,7 +1598,7 @@ fi
+ AC_DEFUN(AC_FUNC_STRCOLL,
+ [AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
+ [AC_TRY_RUN([#include <string.h>
+-main ()
++int main (void)
+ {
+ exit (strcoll ("abc", "def") >= 0 ||
+ strcoll ("ABC", "DEF") >= 0 ||
+@@ -1615,7 +1615,7 @@ AC_DEFUN(AC_FUNC_SETVBUF_REVERSED,
+ ac_cv_func_setvbuf_reversed,
+ [AC_TRY_RUN([#include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+-main () {
++int main (void) {
+ /* This call has the arguments reversed.
+ A reversed system may check and see that the address of main
+ is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */
+@@ -1647,7 +1647,7 @@ LIBS="-lintl $LIBS"])])])
+ AC_DEFUN(AC_FUNC_MEMCMP,
+ [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
+ [AC_TRY_RUN([
+-main()
++int main(void)
+ {
+ char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+ exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+@@ -1805,7 +1805,7 @@ AC_TRY_RUN(
+ #if !defined(__STDC__) || __STDC__ != 1
+ #define volatile
+ #endif
+-main() {
++int main(void) {
+ volatile char c = 255; exit(c < 0);
+ }], ac_cv_c_char_unsigned=yes, ac_cv_c_char_unsigned=no)
+ fi])
+@@ -1819,7 +1819,7 @@ AC_DEFUN(AC_C_LONG_DOUBLE,
+ [if test "$GCC" = yes; then
+ ac_cv_c_long_double=yes
+ else
+-AC_TRY_RUN([int main() {
++AC_TRY_RUN([int main(void) {
+ /* 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 +1834,7 @@ 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)
+-AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
++AC_TRY_RUN([int main(void) { exit(sizeof(int) != 2); }],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
+ ])
+@@ -1842,7 +1842,7 @@ AC_TRY_RUN([main() { 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)
+-AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }],
++AC_TRY_RUN([int main(void) { exit(sizeof(long int) != 8); }],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
+ ])
+@@ -1862,7 +1862,7 @@ 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([main () {
++AC_TRY_RUN([int main (void) {
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+@@ -1885,7 +1885,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() {], [ac_cv_c_inline=$ac_kw; break])
++ AC_TRY_COMPILE(, [} $ac_kw foo(void) {], [ac_cv_c_inline=$ac_kw; break])
+ done
+ ])
+ case "$ac_cv_c_inline" in
+@@ -2277,7 +2277,7 @@ AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS,
+ #include <sys/types.h>
+ #include <signal.h>
+ ucatch (isig) { }
+-main () {
++int main (void) {
+ int i = fork (), status;
+ if (i == 0) { sleep (3); kill (getppid (), SIGINT); sleep (3); exit (0); }
+ signal (SIGINT, ucatch);
+@@ -2654,7 +2654,7 @@ AC_CACHE_VAL(ac_cv_exeext,
+ ac_cv_exeext=.exe
+ else
+ rm -f conftest*
+- echo 'int main () { return 0; }' > conftest.$ac_ext
++ echo 'int main (void) { return 0; }' > conftest.$ac_ext
+ ac_cv_exeext=
+ if AC_TRY_EVAL(ac_link); then
+ for file in conftest.*; do
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2022-11-03 1:24 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-11-03 1:24 UTC (permalink / raw
To: gentoo-commits
commit: c305a45884a8f01838d6e032f469d7f9423154e1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 01:21:36 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 01:23:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c305a458
sys-devel/autoconf: further Clang 16 patches for autoconf 2.13
Reported by matsl when building XEmacs 21.4 (21.5 - which is WIP - works
with newer autoconf).
A bunch of the built-in/provided tests from autoconf 2.13 suffered
from -Wimplicit-int or -Wimplicit-function-declaration. We also
disable the {get,set}pgrp tests (see the patch for details, but
the gist is they're unfixable without some substantial effort
on POSIX systems nowadays and there's no need anyway -- they're
gone in newer autoconf and we never expect them to fail.)
Bug: https://bugs.gentoo.org/874366
Reported-by: Mats Lidell <matsl <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...conf-2.13-r3.ebuild => autoconf-2.13-r4.ebuild} | 1 +
...onf-2.13-Clang-16-fixes-for-various-tests.patch | 243 +++++++++++++++++++++
2 files changed, 244 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.13-r3.ebuild b/sys-devel/autoconf/autoconf-2.13-r4.ebuild
similarity index 96%
rename from sys-devel/autoconf/autoconf-2.13-r3.ebuild
rename to sys-devel/autoconf/autoconf-2.13-r4.ebuild
index 45a43a49c6f8..3593b3e30269 100644
--- a/sys-devel/autoconf/autoconf-2.13-r3.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r4.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${P}-test-fixes.patch #146592
"${FILESDIR}"/${P}-perl-5.26.patch
"${FILESDIR}"/${P}-K-R-decls-clang.patch
+ "${FILESDIR}"/${P}-Clang-16-fixes-for-various-tests.patch
)
src_configure() {
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
new file mode 100644
index 000000000000..b9319f0a4b71
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
@@ -0,0 +1,243 @@
+From de47e22d9b4f5fd5f1c9b9de798218a46ef94b98 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
+
+Fixes -Wimplicit-int and -Wimplicit-function-declaration
+issues in various built-in tests.
+
+Noticed when building XEmacs 21.4 (thanks to matsl for reporting).
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/acgeneral.m4
++++ b/acgeneral.m4
+@@ -1988,6 +1988,7 @@ changequote([, ])dnl
+ AC_MSG_CHECKING(size of $1)
+ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
++#include <stdlib.h>
+ main(void)
+ {
+ FILE *f=fopen("conftestval", "w");
+--- a/acspecific.m4
++++ b/acspecific.m4
+@@ -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.
+ AC_TRY_RUN([#include <ctype.h>
++#include <stdlib.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+@@ -819,6 +820,7 @@ esac
+
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
++#include <stdlib.h>
+ #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,
+ [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>
++#include <stdlib.h>
+ #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,
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <stdlib.h>
+
+ /* This mess was copied from the GNU getpagesize.h. */
+ #ifndef HAVE_GETPAGESIZE
+@@ -1165,49 +1169,17 @@ AC_DEFUN(AC_FUNC_GETPGRP,
+ *
+ * Snarfed from Chet Ramey's bash pgrp.c test program
+ */
+-#include <stdio.h>
+-#include <sys/types.h>
+-
+-int pid;
+-int pg1, pg2, pg3, pg4;
+-int ng, np, s, child;
++#include <stdlib.h>
+
+ int main(void)
+ {
+- pid = getpid();
+- pg1 = getpgrp(0);
+- pg2 = getpgrp();
+- pg3 = getpgrp(pid);
+- pg4 = getpgrp(1);
+-
+- /*
+- * If all of these values are the same, it's pretty sure that
+- * we're on a system that ignores getpgrp's first argument.
+- */
+- if (pg2 == pg4 && pg1 == pg3 && pg2 == pg3)
+- exit(0);
+-
+- child = fork();
+- if (child < 0)
+- exit(1);
+- else if (child == 0) {
+- np = getpid();
+- /*
+- * If this is Sys V, this will not work; pgrp will be
+- * set to np because setpgrp just changes a pgrp to be
+- * the same as the pid.
+- */
+- setpgrp(np, pg1);
+- ng = getpgrp(0); /* Same result for Sys V and BSD */
+- if (ng == pg1) {
+- exit(1);
+- } else {
+- exit(0);
+- }
+- } else {
+- wait(&s);
+- exit(s>>8);
+- }
++ /* XXX: Gentoo: This function used to check for
++ BSD vs POSIX getpgrp but the test fails to compile
++ on modern POSIX systems when not relying on implicit
++ function declarations. It has no value anyway on such
++ systems and it's been removed in newer autoconf.
++ */
++ exit(0);
+ }
+ ], 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
+ AC_DEFUN(AC_FUNC_SETPGRP,
+ [AC_CACHE_CHECK(whether setpgrp takes no argument, ac_cv_func_setpgrp_void,
+ AC_TRY_RUN([
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
++#include <stdlib.h>
+
+ /*
+ * If this system has a BSD-style setpgrp, which takes arguments, exit
+@@ -1230,10 +1200,13 @@ AC_TRY_RUN([
+ */
+ int main(void)
+ {
+- if (setpgrp(1,1) == -1)
+- exit(0);
+- else
+- exit(1);
++ /* XXX: Gentoo: This function used to check for
++ BSD vs POSIX gsetpgrp but the test fails to compile
++ on modern POSIX systems when not relying on implicit
++ function declarations. It has no value anyway on such
++ systems and it's been removed in newer autoconf.
++ */
++ exit(1);
+ }
+ ], 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,
+ 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. */
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/wait.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+@@ -1270,7 +1245,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. */
+-static
++static void
+ #ifdef __cplusplus
+ sparc_address_test (int arg)
+ #else
+@@ -1359,6 +1334,7 @@ AC_DEFUN(AC_FUNC_WAIT3,
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <stdio.h>
++#include <stdlib.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,
+ # 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>
+ int main(void) {
+ struct stat s, t;
+ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
+@@ -1598,6 +1575,7 @@ fi
+ AC_DEFUN(AC_FUNC_STRCOLL,
+ [AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
+ [AC_TRY_RUN([#include <string.h>
++#include <stdlib.h>
+ int main (void)
+ {
+ exit (strcoll ("abc", "def") >= 0 ||
+@@ -1614,6 +1592,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>
++#include <stdlib.h>
+ /* If setvbuf has the reversed format, exit 0. */
+ int main (void) {
+ /* This call has the arguments reversed.
+@@ -1646,7 +1625,8 @@ LIBS="-lintl $LIBS"])])])
+
+ AC_DEFUN(AC_FUNC_MEMCMP,
+ [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
+-[AC_TRY_RUN([
++[AC_TRY_RUN([#include <stdlib.h>
++#include <string.h>
+ int main(void)
+ {
+ char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+@@ -1805,6 +1785,7 @@ AC_TRY_RUN(
+ #if !defined(__STDC__) || __STDC__ != 1
+ #define volatile
+ #endif
++#include <stdlib.h>
+ 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,
+ [if test "$GCC" = yes; then
+ ac_cv_c_long_double=yes
+ else
+-AC_TRY_RUN([int main(void) {
++AC_TRY_RUN([#include <stdlib.h>
++int main(void) {
+ /* 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
+ AC_DEFUN(AC_INT_16_BITS,
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl
+ AC_MSG_CHECKING(whether int is 16 bits)
+-AC_TRY_RUN([int main(void) { exit(sizeof(int) != 2); }],
++AC_TRY_RUN([#include <stdlib.h>
++int main(void) { exit(sizeof(int) != 2); }],
+ [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); }],
+ 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)
+-AC_TRY_RUN([int main(void) { exit(sizeof(long int) != 8); }],
++AC_TRY_RUN([#include <stdlib.h>
++int main(void) { exit(sizeof(long int) != 8); }],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
+ ])
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2022-11-18 1:03 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-11-18 1:03 UTC (permalink / raw
To: gentoo-commits
commit: cc030538dc51e0bccceea9372bfab68cda588b8c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 00:55:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 01:02:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc030538
sys-devel/autoconf: backport further Clang 16 fixes (2.71)
Bug: https://bugs.gentoo.org/870412
Signed-off-by: Sam James <sam <AT> gentoo.org>
...conf-2.71-r4.ebuild => autoconf-2.71-r5.ebuild} | 1 +
.../files/autoconf-2.13-K-R-decls-clang.patch | 2 +-
.../files/autoconf-2.71-K-R-decls-clang-deux.patch | 94 ++++++++++++++++++++++
.../files/autoconf-2.71-K-R-decls-clang.patch | 2 +-
4 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/sys-devel/autoconf/autoconf-2.71-r4.ebuild b/sys-devel/autoconf/autoconf-2.71-r5.ebuild
similarity index 98%
rename from sys-devel/autoconf/autoconf-2.71-r4.ebuild
rename to sys-devel/autoconf/autoconf-2.71-r5.ebuild
index 225cfc50a50f..3ecf3ddc5979 100644
--- a/sys-devel/autoconf/autoconf-2.71-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r5.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
"${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
)
src_prepare() {
diff --git a/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch b/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch
index 874712cea102..42c3018aea8c 100644
--- a/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch
+++ b/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch
@@ -1,7 +1,7 @@
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
+Backport the K&R decls fix to 2.13 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.
diff --git a/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch b/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch
new file mode 100644
index 000000000000..6a3d6580a3f6
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch
@@ -0,0 +1,94 @@
+https://bugs.gentoo.org/870412
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=bf5a75953b6d504f0405b1ca33b039b8dd39eef4
+
+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.
+
+From bf5a75953b6d504f0405b1ca33b039b8dd39eef4 Mon Sep 17 00:00:00 2001
+From: Zack Weinberg <zackw@panix.com>
+Date: Thu, 10 Nov 2022 12:05:30 -0500
+Subject: More fixes for compilers that reject K&R function definitions.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes all of the remaining failures exposed by running the
+testsuite with GCC 12 and
+CC='cc -Wimplicit-function-declaration -Wold-style-definition
+ -Wimplicit-int -Werror'
+.
+
+* lib/autoconf/c.m4 (_AC_C_C89_TEST_GLOBALS): Don’t use K&R function
+ definitions.
+* lib/autoconf/specific.m4 (AC_SYS_RESTARTABLE_SYSCALLS): Likewise.
+ (AC_FUNC_MKTIME): Declare functions taking no arguments as ‘fn (void)’
+ not ‘fn ()’.
+* lib/autoconf/c.m4 (_AC_C_C99_TEST_GLOBALS): Declare free().
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -1153,9 +1153,7 @@ struct stat;
+ /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
+ struct buf { int x; };
+ struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
++static char *e (char **p, int i)
+ {
+ return p[i];
+ }
+@@ -1212,6 +1210,7 @@ extern int puts (const char *);
+ extern int printf (const char *, ...);
+ extern int dprintf (int, const char *, ...);
+ extern void *malloc (size_t);
++extern void free (void *);
+
+ // Check varargs macros. These examples are taken from C99 6.10.3.5.
+ // dprintf is used instead of fprintf to avoid needing to declare
+--- a/lib/autoconf/functions.m4
++++ b/lib/autoconf/functions.m4
+@@ -1091,7 +1091,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;
+@@ -1128,7 +1128,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;
+@@ -1170,7 +1170,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. */
+--- a/lib/autoconf/specific.m4
++++ b/lib/autoconf/specific.m4
+@@ -361,10 +361,9 @@ AC_INCLUDES_DEFAULT
+ /* Some platforms explicitly require an extern "C" signal handler
+ when using C++. */
+ #ifdef __cplusplus
+-extern "C" void ucatch (int dummy) { }
+-#else
+-void ucatch (dummy) int dummy; { }
++extern "C"
+ #endif
++void ucatch (int dummy) { }
+
+ int
+ main (void)
+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
index 33cb728695bb..e2e451e86920 100644
--- 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
@@ -1,7 +1,7 @@
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
+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.
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/
@ 2022-11-18 1:03 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-11-18 1:03 UTC (permalink / raw
To: gentoo-commits
commit: 541ccf270b9b9b5631072a654cd3add5ccd433e7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 01:01:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 01:02:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541ccf27
sys-devel/autoconf: backport further Clang 16 fixes (2.69)
It turns out we had some of these fixes already in our 2.69 from
previous backporting work which ended up catching stuff which wasn't actually
applied upstream yet, so the patch change here is much smaller than for 2.71.
Bug: https://bugs.gentoo.org/870412
Signed-off-by: Sam James <sam <AT> gentoo.org>
...conf-2.69-r7.ebuild => autoconf-2.69-r8.ebuild} | 0
.../files/autoconf-2.69-K-R-decls-clang.patch | 29 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/sys-devel/autoconf/autoconf-2.69-r7.ebuild b/sys-devel/autoconf/autoconf-2.69-r8.ebuild
similarity index 100%
rename from sys-devel/autoconf/autoconf-2.69-r7.ebuild
rename to sys-devel/autoconf/autoconf-2.69-r8.ebuild
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
index 9f16bc93adba..77444ebc5be6 100644
--- 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
@@ -1,5 +1,6 @@
https://bugs.gentoo.org/870412
https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b
+(and contains a backport of https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=bf5a75953b6d504f0405b1ca33b039b8dd39eef4)
Backport the K&R decls fix to 2.69 to avoid configure tests
failing (often "silently", i.e. doesn't fail the build of
@@ -363,3 +364,31 @@ Subject: [PATCH] backport K&R decl fixes
#define mymacro1(arg) arg
#define mymacro2]])
# The difference in space-before-open-paren is intentional.
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -1106,9 +1106,7 @@ struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
++static char *e (char **p, int i)
+ {
+ return p[i];
+ }
+--- a/lib/autoconf/specific.m4
++++ b/lib/autoconf/specific.m4
+@@ -251,10 +251,9 @@ AC_INCLUDES_DEFAULT
+ /* Some platforms explicitly require an extern "C" signal handler
+ when using C++. */
+ #ifdef __cplusplus
+-extern "C" void ucatch (int dummy) { }
+-#else
+-void ucatch (dummy) int dummy; { }
++extern "C"
+ #endif
++void ucatch (int dummy) { }
+
+ int
+ main (void)
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-11-18 1:03 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-13 20:08 [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/, sys-devel/autoconf/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2022-11-18 1:03 Sam James
2022-11-18 1:03 Sam James
2022-11-03 1:24 Sam James
2022-09-19 16:26 Sam James
2022-09-10 0:29 Sam James
2021-08-01 19:44 Andreas K. Hüttel
2020-12-01 17:19 Lars Wendler
2020-11-11 16:23 Lars Wendler
2020-10-21 7:00 Lars Wendler
2018-12-22 19:03 Andreas K. Hüttel
2017-08-04 15:17 Lars Wendler
2017-04-27 13:42 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox