| 1 |
commit: fefbb1236959fa6ea619899f7d42c694bdc3e3bd |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 15:07:45 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 15:08:09 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefbb123 |
| 7 |
|
| 8 |
sys-devel/libtool: fix tests w/ grep-3.8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/892635 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../libtool/files/libtool-2.4.7-grep-3.8.patch | 31 ++++++++++++++++++++++ |
| 14 |
sys-devel/libtool/libtool-2.4.7-r1.ebuild | 4 ++- |
| 15 |
sys-devel/libtool/libtool-9999.ebuild | 6 +++-- |
| 16 |
3 files changed, 38 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch b/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..8f1de478aece |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch |
| 23 |
@@ -0,0 +1,31 @@ |
| 24 |
+https://bugs.gentoo.org/892635 |
| 25 |
+https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg00004.html |
| 26 |
+ |
| 27 |
+From 414deacee0f564afdf2d7750450274c581330a59 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@××××××.com> |
| 29 |
+Date: Wed, 21 Dec 2022 13:14:03 +0100 |
| 30 |
+Subject: [PATCH] tests: Fix grep warning about stray \ before / |
| 31 |
+ |
| 32 |
+Recent version of grep emit a warning if stray \ is found before /. |
| 33 |
+This leads to the link-order test failure. |
| 34 |
+ |
| 35 |
+ * tests/link-order.at: Remove unneeded \ before / |
| 36 |
+--- a/tests/link-order.at |
| 37 |
++++ b/tests/link-order.at |
| 38 |
+@@ -99,12 +99,12 @@ aix* | interix*) ;; # These systems have different path syntax |
| 39 |
+ case $hardcode_direct$hardcode_direct_absolute in |
| 40 |
+ yesno) |
| 41 |
+ AT_CHECK([if $EGREP relinking stderr; then |
| 42 |
+- $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout |
| 43 |
++ $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout |
| 44 |
+ else :; fi], [0], [ignore], [], [echo "wrong link order"]) |
| 45 |
+ ;; |
| 46 |
+ *) |
| 47 |
+ AT_CHECK([if $EGREP relinking stderr; then |
| 48 |
+- $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout |
| 49 |
++ $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout |
| 50 |
+ else :; fi], [0], [ignore], [], [echo "wrong link order"]) |
| 51 |
+ ;; |
| 52 |
+ esac |
| 53 |
+-- |
| 54 |
+2.38.1 |
| 55 |
|
| 56 |
diff --git a/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sys-devel/libtool/libtool-2.4.7-r1.ebuild |
| 57 |
index 405ca5779a7a..f9db3294ea9e 100644 |
| 58 |
--- a/sys-devel/libtool/libtool-2.4.7-r1.ebuild |
| 59 |
+++ b/sys-devel/libtool/libtool-2.4.7-r1.ebuild |
| 60 |
@@ -30,7 +30,8 @@ RDEPEND=" |
| 61 |
sys-devel/gnuconfig |
| 62 |
>=sys-devel/autoconf-2.69:* |
| 63 |
>=sys-devel/automake-1.13:* |
| 64 |
- >=dev-libs/libltdl-2.4.7" |
| 65 |
+ >=dev-libs/libltdl-2.4.7 |
| 66 |
+" |
| 67 |
DEPEND="${RDEPEND}" |
| 68 |
[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" |
| 69 |
|
| 70 |
@@ -44,6 +45,7 @@ PATCHES=( |
| 71 |
"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch |
| 72 |
"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch |
| 73 |
"${FILESDIR}"/${PN}-2.4.7-werror-lto.patch |
| 74 |
+ "${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch |
| 75 |
) |
| 76 |
|
| 77 |
src_prepare() { |
| 78 |
|
| 79 |
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild |
| 80 |
index ae3d351ad479..17e669733130 100644 |
| 81 |
--- a/sys-devel/libtool/libtool-9999.ebuild |
| 82 |
+++ b/sys-devel/libtool/libtool-9999.ebuild |
| 83 |
@@ -1,4 +1,4 @@ |
| 84 |
-# Copyright 1999-2022 Gentoo Authors |
| 85 |
+# Copyright 1999-2023 Gentoo Authors |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
|
| 88 |
EAPI=7 |
| 89 |
@@ -30,7 +30,8 @@ RDEPEND=" |
| 90 |
sys-devel/gnuconfig |
| 91 |
>=sys-devel/autoconf-2.69:* |
| 92 |
>=sys-devel/automake-1.13:* |
| 93 |
- >=dev-libs/libltdl-2.4.7" |
| 94 |
+ >=dev-libs/libltdl-2.4.7 |
| 95 |
+" |
| 96 |
DEPEND="${RDEPEND}" |
| 97 |
[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" |
| 98 |
|
| 99 |
@@ -43,6 +44,7 @@ PATCHES=( |
| 100 |
"${FILESDIR}"/${PN}-2.4.6-mint.patch |
| 101 |
"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch |
| 102 |
"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch |
| 103 |
+ "${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch |
| 104 |
) |
| 105 |
|
| 106 |
src_prepare() { |
Archives