From 6a5aeaf94807ee15ee49114de58fa662ae600fa6 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Wed, 1 Dec 2021 01:51:24 +0300
Subject: [PATCH] libtool upgrade to 2.4.6 - 16/n: Fedora ABI-specific
directories patch:
https://src.fedoraproject.org/rpms/libtool/blob/master/f/libtool-2.4.5-rpath.patch
---
acinclude/libtool.m4 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/acinclude/libtool.m4 b/acinclude/libtool.m4
index 24e2a19ec9..151b10bf9d 100644
--- a/acinclude/libtool.m4
+++ b/acinclude/libtool.m4
@@ -2871,6 +2871,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2879,7 +2882,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on