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
This commit is contained in:
Marcus Meissner 2022-09-05 07:06:56 +00:00 committed by Git OBS Bridge
parent be282f3265
commit 79455bca69
3 changed files with 42 additions and 0 deletions

View File

@ -0,0 +1,34 @@
From 1e13a1944f725ccc24bce1a2fa6f9009ba8a2270 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <Andreas.Stieger@gmx.de>
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Sep 4 19:47:46 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
- 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 <dmueller@suse.com>

View File

@ -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