From 79455bca69ca34962c0a5959d0805c85f0c589df9ea64cf0bdc718bf1a8b9911 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 5 Sep 2022 07:06:56 +0000 Subject: [PATCH] Accepting request 1001158 from home:AndreasStieger:branches:Base:System - allow tests to pass with GNU grep 3.8 boo#1203097 OBS-URL: https://build.opensuse.org/request/show/1001158 OBS-URL: https://build.opensuse.org/package/show/Base:System/libtool?expand=0&rev=92 --- libtool-2.4.7-grep-3.8.patch | 34 ++++++++++++++++++++++++++++++++++ libtool.changes | 6 ++++++ libtool.spec | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 libtool-2.4.7-grep-3.8.patch diff --git a/libtool-2.4.7-grep-3.8.patch b/libtool-2.4.7-grep-3.8.patch new file mode 100644 index 0000000..443feab --- /dev/null +++ b/libtool-2.4.7-grep-3.8.patch @@ -0,0 +1,34 @@ +From 1e13a1944f725ccc24bce1a2fa6f9009ba8a2270 Mon Sep 17 00:00:00 2001 +From: Andreas Stieger +Date: Sun, 4 Sep 2022 22:24:41 +0200 +Subject: [PATCH] tests/link-order.at: avoid warning and test failure with GNU + grep 3.8 + +https://bugzilla.opensuse.org/show_bug.cgi?id=1203097 +https://savannah.gnu.org/patch/index.php?10275 + +--- + tests/link-order.at | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/link-order.at b/tests/link-order.at +index 3f01a00d..a145347f 100644 +--- a/tests/link-order.at ++++ b/tests/link-order.at +@@ -99,12 +99,12 @@ aix* | interix*) ;; # These systems have different path syntax + case $hardcode_direct$hardcode_direct_absolute in + yesno) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout ++ $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + *) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout ++ $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + esac +-- +2.37.2 \ No newline at end of file diff --git a/libtool.changes b/libtool.changes index 161a197..f90b480 100644 --- a/libtool.changes +++ b/libtool.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 4 19:47:46 UTC 2022 - Andreas Stieger + +- allow tests to pass with GNU grep 3.8 boo#1203097 + add libtool-2.4.7-grep-3.8.patch + ------------------------------------------------------------------- Tue Mar 29 13:46:49 UTC 2022 - Dirk Müller diff --git a/libtool.spec b/libtool.spec index ddc047a..2949616 100644 --- a/libtool.spec +++ b/libtool.spec @@ -38,6 +38,8 @@ Source4: libtool-rpmlintrc Patch0: libtool-reproducible-hostname.patch # PATCH-FIX-OPENSUSE: workaround irrelevant compiler warning Patch1: handle-Werror-return-type.patch +# PATCH-FIX-OPENSUSE -- fix tests with GNU grep 3.8 boo#1203097 +Patch2: libtool-2.4.7-grep-3.8.patch BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: gcc-fortran