commit: f10f1764a0d0adc2265731ca20e4bf58fe9f3950 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> AuthorDate: Wed May 10 18:16:46 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat May 13 09:29:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10f1764
sys-devel/autoconf: Fix libtool test Gentoo-Bug: https://bugs.gentoo.org/584144 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4598 sys-devel/autoconf/autoconf-2.69-r3.ebuild | 5 +++- .../files/autoconf-2.69-fix-libtool-test.patch | 31 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/sys-devel/autoconf/autoconf-2.69-r3.ebuild b/sys-devel/autoconf/autoconf-2.69-r3.ebuild index 37354a400d9..54b5079415c 100644 --- a/sys-devel/autoconf/autoconf-2.69-r3.ebuild +++ b/sys-devel/autoconf/autoconf-2.69-r3.ebuild @@ -36,6 +36,9 @@ src_prepare() { # usr/bin/libtool is provided by binutils-apple, need gnu libtool [[ ${CHOST} == *-darwin* ]] && \ PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch ) - PATCHES+=( "${FILESDIR}"/${PN}-2.69-perl-5.26.patch ) + PATCHES+=( + "${FILESDIR}"/${PN}-2.69-perl-5.26.patch + "${FILESDIR}"/${P}-fix-libtool-test.patch + ) toolchain-autoconf_src_prepare } diff --git a/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch b/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch new file mode 100644 index 00000000000..e75eba62160 --- /dev/null +++ b/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch @@ -0,0 +1,31 @@ +From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001 +From: "Gary V. Vaughan" <g...@gnu.org> +Date: Mon, 3 Nov 2014 07:25:03 +0100 +Subject: tests: avoid spurious test failure with libtool 2.4.3 + +Based on a report by Bruce Dubbs. + +* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the +older `quote'. + +Signed-off-by: Eric Blake <ebl...@redhat.com> +--- + tests/foreign.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/foreign.at b/tests/foreign.at +index a9dc33c..d4702cd 100644 +--- a/tests/foreign.at ++++ b/tests/foreign.at +@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore]) + # Make sure at-path contains something valid, and let the test suite + # display it when verbose. And fail, skipping would too easily hide + # problems. +-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) ++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) + AT_CHECK([test -f "`sed -n 1p stdout`"]) + + # Older libtoolize installed everything but install-sh... +-- +cgit v1.0-41-gc330 +
