60 lines
2.6 KiB
Diff
60 lines
2.6 KiB
Diff
From cba80c7d0aff8d43ae4d1fde2336560f9315a10c Mon Sep 17 00:00:00 2001
|
|
From: openEuler Buildteam <buildteam@openeuler.org>
|
|
Date: Wed, 1 Jan 2020 01:57:21 +0800
|
|
Subject: [PATCH] change rpath
|
|
|
|
---
|
|
configure | 5 ++++-
|
|
m4/libtool.m4 | 5 ++++-
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index c726942..fe9e5fd 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -14296,6 +14296,9 @@ fi
|
|
# 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
|
|
@@ -14304,7 +14307,7 @@ fi
|
|
# 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
|
|
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
|
index ee80844..f8ad53d 100644
|
|
--- a/m4/libtool.m4
|
|
+++ b/m4/libtool.m4
|
|
@@ -2866,6 +2866,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
|
|
@@ -2874,7 +2877,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
|
|
--
|
|
1.8.3.1
|
|
|