From 385dfa5c67a93611e145e97d92f7ab085d1401da Mon Sep 17 00:00:00 2001
From: renxichen <renhongxun@huawei.com>
Date: Thu, 2 Feb 2023 09:36:01 +0800
Subject: [PATCH] tests/link-order.at: avoid warning and test failure with GNU
 grep 3.8

---
 ...er.at-avoid-warning-and-test-failure.patch | 31 +++++++++++++++++++
 libtool.spec                                  |  6 +++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 backport-tests-link-order.at-avoid-warning-and-test-failure.patch

diff --git a/backport-tests-link-order.at-avoid-warning-and-test-failure.patch b/backport-tests-link-order.at-avoid-warning-and-test-failure.patch
new file mode 100644
index 0000000..02efa32
--- /dev/null
+++ b/backport-tests-link-order.at-avoid-warning-and-test-failure.patch
@@ -0,0 +1,31 @@
+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
+---
+ 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 3f01a00..a145347 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.27.0
+
diff --git a/libtool.spec b/libtool.spec
index 67409cb..c7a9cf4 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -3,13 +3,14 @@
 
 Name:    libtool
 Version: 2.4.7
-Release: 1
+Release: 2
 License: GPLv2+ and LGPLv2+ and GFDL-1.3-or-later
 Summary: The GNU Portable Library Tool
 URL:     http://www.gnu.org/software/libtool/
 Source0:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
 
 Patch0:     libtool-2.4.5-rpath.patch
+Patch6000:	backport-tests-link-order.at-avoid-warning-and-test-failure.patch
 
 Requires: gcc(major),autoconf, automake, sed, tar, findutils
 
@@ -101,6 +102,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
 
 
 %changelog
+*Thu Feb 02 2023 renhongxun <renhongxun@h-partners.com> - 2.4.7-2
+- backport: tests/link-order.at: avoid warning and test failure with GNU grep 3.8
+
 * Thu Nov 03 2022 renhongxun <renhongxun@h-partners.com> - 2.4.7-1
 - upgrade version to 2.4.7