| 1 |
commit: 565193ae54cfbf09e592ed5607b3775986d93c53 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 4 15:17:17 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 4 15:17:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565193ae |
| 7 |
|
| 8 |
sys-devel/autoconf: Revbump to add another perl-5.26 fix (bug #625576). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
...conf-2.69-r3.ebuild => autoconf-2.69-r4.ebuild} | 6 +++-- |
| 13 |
.../autoconf/files/autoconf-2.69-perl-5.26-2.patch | 30 ++++++++++++++++++++++ |
| 14 |
2 files changed, 34 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-devel/autoconf/autoconf-2.69-r3.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild |
| 17 |
similarity index 94% |
| 18 |
rename from sys-devel/autoconf/autoconf-2.69-r3.ebuild |
| 19 |
rename to sys-devel/autoconf/autoconf-2.69-r4.ebuild |
| 20 |
index 54b5079415c..eac25293936 100644 |
| 21 |
--- a/sys-devel/autoconf/autoconf-2.69-r3.ebuild |
| 22 |
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild |
| 23 |
@@ -1,14 +1,14 @@ |
| 24 |
# Copyright 1999-2017 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI="5" |
| 28 |
+EAPI=6 |
| 29 |
|
| 30 |
if [[ ${PV} == "9999" ]] ; then |
| 31 |
EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git |
| 32 |
http://git.savannah.gnu.org/r/${PN}.git" |
| 33 |
# We need all the tags in order to figure out the right version. |
| 34 |
# The git-r3 eclass doesn't support that, so have to stick to 2. |
| 35 |
- inherit git-2 |
| 36 |
+ inherit git-r3 |
| 37 |
else |
| 38 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz |
| 39 |
ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz" |
| 40 |
@@ -39,6 +39,8 @@ src_prepare() { |
| 41 |
PATCHES+=( |
| 42 |
"${FILESDIR}"/${PN}-2.69-perl-5.26.patch |
| 43 |
"${FILESDIR}"/${P}-fix-libtool-test.patch |
| 44 |
+ "${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch |
| 45 |
) |
| 46 |
toolchain-autoconf_src_prepare |
| 47 |
+ eapply_user |
| 48 |
} |
| 49 |
|
| 50 |
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 |
| 51 |
new file mode 100644 |
| 52 |
index 00000000000..6becf807c43 |
| 53 |
--- /dev/null |
| 54 |
+++ b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch |
| 55 |
@@ -0,0 +1,30 @@ |
| 56 |
+https://bugs.gentoo.org/625576 |
| 57 |
+ |
| 58 |
+--- autoconf-2.69/bin/autoheader.in |
| 59 |
++++ autoconf-2.69/bin/autoheader.in |
| 60 |
+@@ -173,6 +173,12 @@ |
| 61 |
+ # Source what the traces are trying to tell us. |
| 62 |
+ verb "$me: running $autoconf to trace from $ARGV[0]"; |
| 63 |
+ my $quoted_tmp = shell_quote ($tmp); |
| 64 |
++my $perl_tmp; |
| 65 |
++if ( $tmp =~ /^\// ) { |
| 66 |
++ $perl_tmp=$tmp; |
| 67 |
++} else { |
| 68 |
++ $perl_tmp="./".$tmp; |
| 69 |
++} |
| 70 |
+ xsystem ("$autoconf" |
| 71 |
+ # If you change this list, update the |
| 72 |
+ # `Autoheader-preselections' section of autom4te.in. |
| 73 |
+@@ -182,9 +188,9 @@ |
| 74 |
+ . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl"); |
| 75 |
+ |
| 76 |
+ local (%verbatim, %symbol); |
| 77 |
+-debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; |
| 78 |
+-do "$tmp/traces.pl"; |
| 79 |
+-warn "couldn't parse $tmp/traces.pl: $@" if $@; |
| 80 |
++debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; |
| 81 |
++do "$perl_tmp/traces.pl"; |
| 82 |
++warn "couldn't parse $perl_tmp/traces.pl: $@" if $@; |
| 83 |
+ unless ($config_h) |
| 84 |
+ { |
| 85 |
+ error "error: AC_CONFIG_HEADERS not found in $ARGV[0]"; |
Archives