diff options
| author |   Harri Nieminen <moikkis@gmail.com> | 2017-05-10 21:16:46 +0300 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2017-05-13 11:29:55 +0200 |
| commit | f10f1764a0d0adc2265731ca20e4bf58fe9f3950 (patch) | |
| tree | 6c9054b3b9c10e47de8e821c8249154b8eea8940 | |
| parent | dev-python/graph-tool: Bump minimum CGAL required to 4.9 (diff) | |
| download | gentoo-f10f1764a0d0adc2265731ca20e4bf58fe9f3950.tar.gz gentoo-f10f1764a0d0adc2265731ca20e4bf58fe9f3950.tar.bz2 gentoo-f10f1764a0d0adc2265731ca20e4bf58fe9f3950.zip | |
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
| -rw-r--r-- | sys-devel/autoconf/autoconf-2.69-r3.ebuild | 5 | ||||
| -rw-r--r-- | sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch | 31 |
2 files changed, 35 insertions, 1 deletions
diff --git a/sys-devel/autoconf/autoconf-2.69-r3.ebuild b/sys-devel/autoconf/autoconf-2.69-r3.ebuild index 37354a400d9c..54b5079415c2 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 000000000000..e75eba621606 --- /dev/null +++ b/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch @@ -0,0 +1,31 @@ +From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001 +From: "Gary V. Vaughan" <gary@gnu.org> +Date: Mon, 3 Nov 2014 07:25:03 +0100 +Subject: tests: avoid spurious test failure with libtool 2.4.3 + +Based on a report by Bruce Dubbs. + +* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the +older `quote'. + +Signed-off-by: Eric Blake <eblake@redhat.com> +--- + tests/foreign.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/foreign.at b/tests/foreign.at +index a9dc33c..d4702cd 100644 +--- a/tests/foreign.at ++++ b/tests/foreign.at +@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore]) + # Make sure at-path contains something valid, and let the test suite + # display it when verbose. And fail, skipping would too easily hide + # problems. +-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) ++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) + AT_CHECK([test -f "`sed -n 1p stdout`"]) + + # Older libtoolize installed everything but install-sh... +-- +cgit v1.0-41-gc330 + |