105 lines
5.3 KiB
Diff
105 lines
5.3 KiB
Diff
diff -up gnutls-2.10.3/build-aux/config.rpath gnutls-2.10.3/build-aux/config
|
|
diff -up gnutls-2.10.3/configure.rpath gnutls-2.10.3/configure
|
|
--- gnutls-2.10.3/configure.rpath 2010-11-19 13:40:11.000000000 +0100
|
|
+++ gnutls-2.10.3/configure 2010-11-19 16:15:47.000000000 +0100
|
|
@@ -15439,7 +15439,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
|
|
|
|
@@ -15824,7 +15824,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
# Append ld.so.conf contents 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;/^$/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
|
|
@@ -18908,7 +18908,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
|
|
|
|
@@ -19292,7 +19292,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
# Append ld.so.conf contents 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;/^$/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
|
|
diff -up gnutls-2.10.3/lib/build-aux/config.rpath gnutls-2.10.3/lib/build-aux/config
|
|
diff -up gnutls-2.10.3/lib/configure.rpath gnutls-2.10.3/lib/configure
|
|
--- gnutls-2.10.3/lib/configure.rpath 2010-11-19 13:39:14.000000000 +0100
|
|
+++ gnutls-2.10.3/lib/configure 2010-11-19 16:15:22.000000000 +0100
|
|
@@ -10738,7 +10738,8 @@ 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
|
|
|
|
@@ -11123,7 +11124,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
# Append ld.so.conf contents 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;/^$/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
|
|
@@ -26039,7 +26040,8 @@ 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
|
|
|
|
@@ -26423,7 +26425,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
# Append ld.so.conf contents 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;/^$/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
|
|
diff -up gnutls-2.10.3/libextra/build-aux/config.rpath gnutls-2.10.3/libextra/build-aux/config
|
|
diff -up gnutls-2.10.3/libextra/configure.rpath gnutls-2.10.3/libextra/configure
|
|
--- gnutls-2.10.3/libextra/configure.rpath 2010-11-19 13:39:44.000000000 +0100
|
|
+++ gnutls-2.10.3/libextra/configure 2010-11-19 16:16:21.000000000 +0100
|
|
@@ -9919,7 +9919,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
|
|
|
|
@@ -10304,7 +10304,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
# Append ld.so.conf contents 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;/^$/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
|