diff options
author | Michał Górny <mgorny@gentoo.org> | 2017-03-24 17:27:18 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2017-03-24 17:27:18 +0100 |
commit | 6bb1aaecd1c95373675e6cd0a3eae6ab130d03a2 (patch) | |
tree | 8dc247fac32489b77da7ce30d452ff7fc9613fff /sys-lib-dlsearch/2.4 | |
download | elt-patches-6bb1aaecd1c95373675e6cd0a3eae6ab130d03a2.tar.gz elt-patches-6bb1aaecd1c95373675e6cd0a3eae6ab130d03a2.tar.bz2 elt-patches-6bb1aaecd1c95373675e6cd0a3eae6ab130d03a2.zip |
Move patches from ::gentoo20170317
Diffstat (limited to 'sys-lib-dlsearch/2.4')
-rw-r--r-- | sys-lib-dlsearch/2.4 | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sys-lib-dlsearch/2.4 b/sys-lib-dlsearch/2.4 new file mode 100644 index 0000000..89eb699 --- /dev/null +++ b/sys-lib-dlsearch/2.4 @@ -0,0 +1,21 @@ +the linux target parses /etc/ld.so.conf to see what paths are +searched at runtime, and hardcodes /lib /usr/lib as a fallback. +this works poorly when cross-compiling, so tweak the behavior: + - search $SYSROOT/etc/ld.so.conf + - default to Gentoo's notion of the active multilib + +--- a/configure ++++ b/configure +@@ -10405,9 +10405,9 @@ + hardcode_into_libs=yes + + # 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;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ if test -f "$SYSROOT"/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; }' < "$SYSROOT"/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/@GENTOO_LIBDIR@ /usr/@GENTOO_LIBDIR@ $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on |