[packages/libtool] fix tests, rel 6
baggins
baggins at pld-linux.org
Sat Apr 29 22:23:25 CEST 2023
commit dd406b797e0737a1622e00936d37f049bc27e3ad
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Apr 29 22:23:03 2023 +0200
fix tests, rel 6
...tests-Fix-grep-warning-about-stray-before.patch | 35 ++++++++++++++++++++++
libtool.spec | 4 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
---
diff --git a/libtool.spec b/libtool.spec
index 15446b2..e3e1c99 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -11,7 +11,7 @@ Summary(ru.UTF-8): GNU libtool, набор утилит для генераци
Summary(uk.UTF-8): GNU libtool, набір утиліт для генерації динамічних бібліотек
Name: libtool
Version: 2.4.7
-Release: 5
+Release: 6
Epoch: 2
License: GPL v2+
Group: Development/Tools
@@ -24,6 +24,7 @@ Patch1: %{name}-libdirs.patch
Patch2: %{name}-multilib.patch
Patch3: %{name}-linking-order.patch
Patch4: %{name}-libx32.patch
+Patch5: 0001-tests-Fix-grep-warning-about-stray-before.patch
URL: http://www.gnu.org/software/libtool/
BuildRequires: /usr/bin/which
BuildRequires: autoconf >= 2.62
@@ -153,6 +154,7 @@ utilizando componentes estáticos (raramente necessário).
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%{__sed} -i -e '1s, /usr/bin/env sh,/bin/sh,' libtoolize.in build-aux/ltmain.{in,sh}
diff --git a/0001-tests-Fix-grep-warning-about-stray-before.patch b/0001-tests-Fix-grep-warning-about-stray-before.patch
new file mode 100644
index 0000000..481dd42
--- /dev/null
+++ b/0001-tests-Fix-grep-warning-about-stray-before.patch
@@ -0,0 +1,35 @@
+From 414deacee0f564afdf2d7750450274c581330a59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat at redhat.com>
+Date: Wed, 21 Dec 2022 13:14:03 +0100
+Subject: [PATCH] tests: Fix grep warning about stray \ before /
+
+Recent version of grep emit a warning if stray \ is found before /.
+This leads to the link-order test failure.
+
+ * tests/link-order.at: Remove unneeded \ before /
+---
+ 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.38.1
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libtool.git/commitdiff/dd406b797e0737a1622e00936d37f049bc27e3ad
More information about the pld-cvs-commit
mailing list