2010-09-30 14:15:46 +00:00
|
|
|
diff -up gnutls-2.10.2/build-aux/config.rpath gnutls-2.10.2/build-aux/config
|
|
|
|
diff -up gnutls-2.10.2/configure.rpath gnutls-2.10.2/configure
|
|
|
|
--- gnutls-2.10.2/configure.rpath 2010-09-30 08:43:40.000000000 +0200
|
|
|
|
+++ gnutls-2.10.2/configure 2010-09-30 15:56:59.000000000 +0200
|
|
|
|
@@ -15112,7 +15112,7 @@ shlibpath_var=
|
2010-01-28 21:22:45 +00:00
|
|
|
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
|
|
|
|
|
2010-09-30 14:15:46 +00:00
|
|
|
@@ -15510,7 +15510,7 @@ fi
|
2010-01-28 21:22:45 +00:00
|
|
|
# Append ld.so.conf contents to the search path
|
|
|
|
if test -f /etc/ld.so.conf; then
|
2010-09-30 14:15:46 +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' ' '`
|
2010-01-28 21:22:45 +00:00
|
|
|
- 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
|
2010-09-30 14:15:46 +00:00
|
|
|
@@ -18777,7 +18777,7 @@ shlibpath_var=
|
2010-01-28 21:22:45 +00:00
|
|
|
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
|
|
|
|
|
2010-09-30 14:15:46 +00:00
|
|
|
@@ -19173,7 +19173,7 @@ fi
|
2010-01-28 21:22:45 +00:00
|
|
|
# Append ld.so.conf contents to the search path
|
|
|
|
if test -f /etc/ld.so.conf; then
|
2010-09-30 14:15:46 +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' ' '`
|
2010-01-28 21:22:45 +00:00
|
|
|
- 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
|
2010-09-30 14:15:46 +00:00
|
|
|
diff -up gnutls-2.10.2/lib/build-aux/config.rpath gnutls-2.10.2/lib/build-aux/config
|
|
|
|
diff -up gnutls-2.10.2/lib/configure.rpath gnutls-2.10.2/lib/configure
|
|
|
|
--- gnutls-2.10.2/lib/configure.rpath 2010-09-30 08:42:57.000000000 +0200
|
|
|
|
+++ gnutls-2.10.2/lib/configure 2010-09-30 15:58:06.000000000 +0200
|
|
|
|
@@ -10839,7 +10839,8 @@ shlibpath_var=
|
2010-01-28 21:22:45 +00:00
|
|
|
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
|
|
|
|
|
2010-09-30 14:15:46 +00:00
|
|
|
@@ -11237,7 +11238,7 @@ fi
|
2010-01-28 21:22:45 +00:00
|
|
|
# Append ld.so.conf contents to the search path
|
|
|
|
if test -f /etc/ld.so.conf; then
|
2010-09-30 14:15:46 +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' ' '`
|
2010-01-28 21:22:45 +00:00
|
|
|
- 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
|
2010-09-30 14:15:46 +00:00
|
|
|
@@ -25790,7 +25791,8 @@ shlibpath_var=
|
2010-01-28 21:22:45 +00:00
|
|
|
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
|
|
|
|
|
2010-09-30 14:15:46 +00:00
|
|
|
@@ -26186,7 +26188,7 @@ fi
|
2010-01-28 21:22:45 +00:00
|
|
|
# Append ld.so.conf contents to the search path
|
|
|
|
if test -f /etc/ld.so.conf; then
|
2010-09-30 14:15:46 +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' ' '`
|
2010-01-28 21:22:45 +00:00
|
|
|
- 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
|
2010-09-30 14:15:46 +00:00
|
|
|
diff -up gnutls-2.10.2/libextra/build-aux/config.rpath gnutls-2.10.2/libextra/build-aux/config
|
|
|
|
diff -up gnutls-2.10.2/libextra/configure.rpath gnutls-2.10.2/libextra/configure
|
|
|
|
--- gnutls-2.10.2/libextra/configure.rpath 2010-09-30 08:43:20.000000000 +0200
|
|
|
|
+++ gnutls-2.10.2/libextra/configure 2010-09-30 15:58:49.000000000 +0200
|
|
|
|
@@ -10013,7 +10013,7 @@ shlibpath_var=
|
2010-01-28 21:22:45 +00:00
|
|
|
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
|
|
|
|
|
2010-09-30 14:15:46 +00:00
|
|
|
@@ -10411,7 +10411,7 @@ fi
|
2010-01-28 21:22:45 +00:00
|
|
|
# Append ld.so.conf contents to the search path
|
|
|
|
if test -f /etc/ld.so.conf; then
|
2010-09-30 14:15:46 +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' ' '`
|
2010-01-28 21:22:45 +00:00
|
|
|
- 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
|