58 lines
2.6 KiB
Diff
58 lines
2.6 KiB
Diff
|
From bd59ee8712c74487f02891508ad9de51fe670588 Mon Sep 17 00:00:00 2001
|
||
|
|
From: openEuler Buildteam <buildteam@openeuler.org>
|
||
|
|
Date: Wed, 1 Jan 2020 00:46:32 +0800
|
||
|
|
Subject: [PATCH] change rpath
|
||
|
|
|
||
|
|
---
|
||
|
|
libidn2-2.0.5/configure | 4 +++-
|
||
|
|
libidn2-2.0.5/m4/libtool.m4 | 4 +++-
|
||
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libidn2-2.0.5/configure b/libidn2-2.0.5/configure
|
||
|
|
index c726942..f7dc93a 100755
|
||
|
|
--- a/libidn2-2.0.5/configure
|
||
|
|
+++ b/libidn2-2.0.5/configure
|
||
|
|
@@ -14295,6 +14295,8 @@ fi
|
||
|
|
# Some rework will be needed to allow for fast_install
|
||
|
|
# before this can be enabled.
|
||
|
|
hardcode_into_libs=yes
|
||
|
|
+
|
||
|
|
+ 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
|
||
|
|
@@ -14304,7 +14306,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/libidn2-2.0.5/m4/libtool.m4 b/libidn2-2.0.5/m4/libtool.m4
|
||
|
|
index ee80844..2ff9b60 100644
|
||
|
|
--- a/libidn2-2.0.5/m4/libtool.m4
|
||
|
|
+++ b/libidn2-2.0.5/m4/libtool.m4
|
||
|
|
@@ -2865,6 +2865,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
||
|
|
# Some rework will be needed to allow for fast_install
|
||
|
|
# before this can be enabled.
|
||
|
|
hardcode_into_libs=yes
|
||
|
|
+
|
||
|
|
+ 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
|
||
|
|
@@ -2874,7 +2876,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
|
||
|
|
|