diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-27 14:44:43 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-27 14:45:32 -0600 |
| commit | 12d2a79814987afd34c457a5e4365d7167972bc0 (patch) | |
| tree | 7ff6dc01908ec4c0198a41190ad1d5882aeedf82 /package/util-linux/patches/patch-m4_libtool_m4 | |
| parent | 55bade535d3fca53ff5ceb6e7e1f6ee7369b59fb (diff) | |
unbreak kodi and util-linux, bad qa day.
Diffstat (limited to 'package/util-linux/patches/patch-m4_libtool_m4')
| -rw-r--r-- | package/util-linux/patches/patch-m4_libtool_m4 | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/package/util-linux/patches/patch-m4_libtool_m4 b/package/util-linux/patches/patch-m4_libtool_m4 new file mode 100644 index 000000000..86f48d620 --- /dev/null +++ b/package/util-linux/patches/patch-m4_libtool_m4 @@ -0,0 +1,69 @@ +--- util-linux-2.25.2.orig/m4/libtool.m4 2014-06-25 02:25:47.000000000 -0500 ++++ util-linux-2.25.2/m4/libtool.m4 2014-12-27 12:19:20.527521791 -0600 +@@ -1312,7 +1312,7 @@ ia64-*-hpux*) + rm -rf conftest* + ;; + +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +@@ -1326,10 +1326,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +- powerpc64le-*linux*) +- LD="${LD-ld} -m elf32lppclinux" +- ;; +- powerpc64-*linux*) ++ ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -1348,10 +1345,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- powerpcle-*linux*) +- LD="${LD-ld} -m elf64lppc" +- ;; +- powerpc-*linux*) ++ ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) +@@ -2675,14 +2669,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" +- ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -4602,7 +4592,7 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- _LT_TAGVAR(hardcode_automatic, $1)=no ++ _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +@@ -5850,7 +5840,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1 + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +-_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= |