gnutls/gnutls-2.12.2-rpath.patch

103 lines
5.3 KiB
Diff
Raw Normal View History

2011-04-19 10:19:54 +00:00
diff -up gnutls-2.12.2/build-aux/config.rpath gnutls-2.12.2/build-aux/config
diff -up gnutls-2.12.2/configure.rpath gnutls-2.12.2/configure
--- gnutls-2.12.2/configure.rpath 2011-04-08 18:18:09.000000000 +0200
+++ gnutls-2.12.2/configure 2011-04-19 10:55:42.000000000 +0200
@@ -16740,7 +16740,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-04-19 10:19:54 +00:00
@@ -17125,7 +17125,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
2011-04-19 10:19:54 +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;/^$/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-04-19 10:19:54 +00:00
@@ -20209,7 +20209,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-04-19 10:19:54 +00:00
@@ -20593,7 +20593,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
2011-04-19 10:19:54 +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;/^$/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-04-19 10:19:54 +00:00
diff -up gnutls-2.12.2/lib/build-aux/config.rpath gnutls-2.12.2/lib/build-aux/config
diff -up gnutls-2.12.2/lib/configure.rpath gnutls-2.12.2/lib/configure
--- gnutls-2.12.2/lib/configure.rpath 2011-04-08 18:17:13.000000000 +0200
+++ gnutls-2.12.2/lib/configure 2011-04-19 10:57:03.000000000 +0200
@@ -10842,7 +10842,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-04-19 10:19:54 +00:00
@@ -11227,7 +11227,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
2011-04-19 10:19:54 +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;/^$/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-04-19 10:19:54 +00:00
@@ -28572,7 +28572,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-04-19 10:19:54 +00:00
@@ -28956,7 +28956,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
2011-04-19 10:19:54 +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;/^$/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-04-19 10:19:54 +00:00
diff -up gnutls-2.12.2/libextra/build-aux/config.rpath gnutls-2.12.2/libextra/build-aux/config
diff -up gnutls-2.12.2/libextra/configure.rpath gnutls-2.12.2/libextra/configure
--- gnutls-2.12.2/libextra/configure.rpath 2011-04-08 18:17:42.000000000 +0200
+++ gnutls-2.12.2/libextra/configure 2011-04-19 10:57:59.000000000 +0200
@@ -9971,7 +9971,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-04-19 10:19:54 +00:00
@@ -10356,7 +10356,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
2011-04-19 10:19:54 +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;/^$/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