gnutls/gnutls-2.12.11-rpath.patch

104 lines
5.2 KiB
Diff
Raw Normal View History

2011-09-29 08:00:35 +00:00
diff -up gnutls-2.12.11/build-aux/config.rpath gnutls-2.12.11/build-aux/config
diff -up gnutls-2.12.11/configure.rpath gnutls-2.12.11/configure
--- gnutls-2.12.11/configure.rpath 2011-09-18 20:32:37.000000000 +0200
+++ gnutls-2.12.11/configure 2011-09-27 18:32:17.000000000 +0200
@@ -16377,7 +16377,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
need_lib_prefix=unknown
hardcode_into_libs=no
2011-09-29 08:00:35 +00:00
@@ -16835,7 +16835,7 @@ fi
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
2011-09-29 08:00:35 +00:00
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"
2010-12-08 20:34:28 +00:00
+ sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
2011-09-29 08:00:35 +00:00
@@ -20228,7 +20228,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
need_lib_prefix=unknown
hardcode_into_libs=no
2011-09-29 08:00:35 +00:00
@@ -20684,7 +20684,7 @@ fi
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
2011-09-29 08:00:35 +00:00
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="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
2011-09-29 08:00:35 +00:00
diff -up gnutls-2.12.11/lib/build-aux/config.rpath gnutls-2.12.11/lib/build-aux/config
diff -up gnutls-2.12.11/lib/configure.rpath gnutls-2.12.11/lib/configure
--- gnutls-2.12.11/lib/configure.rpath 2011-09-18 20:31:32.000000000 +0200
+++ gnutls-2.12.11/lib/configure 2011-09-27 18:33:22.000000000 +0200
@@ -11989,7 +11989,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
need_lib_prefix=unknown
hardcode_into_libs=no
2011-09-29 08:00:35 +00:00
@@ -12447,7 +12447,7 @@ fi
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
2011-09-29 08:00:35 +00:00
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="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
2011-09-29 08:00:35 +00:00
@@ -30102,7 +30102,8 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
2011-09-29 08:00:35 +00:00
+
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
need_lib_prefix=unknown
hardcode_into_libs=no
2011-09-29 08:00:35 +00:00
@@ -30558,7 +30559,7 @@ fi
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
2011-09-29 08:00:35 +00:00
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="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
2011-09-29 08:00:35 +00:00
diff -up gnutls-2.12.11/libextra/build-aux/config.rpath gnutls-2.12.11/libextra/build-aux/config
diff -up gnutls-2.12.11/libextra/configure.rpath gnutls-2.12.11/libextra/configure
--- gnutls-2.12.11/libextra/configure.rpath 2011-09-18 20:32:07.000000000 +0200
+++ gnutls-2.12.11/libextra/configure 2011-09-27 18:33:55.000000000 +0200
@@ -10658,7 +10658,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
need_lib_prefix=unknown
hardcode_into_libs=no
2011-09-29 08:00:35 +00:00
@@ -11116,7 +11116,7 @@ fi
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
2011-09-29 08:00:35 +00:00
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="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on