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-config_ltmain_sh | |
| parent | 55bade535d3fca53ff5ceb6e7e1f6ee7369b59fb (diff) | |
unbreak kodi and util-linux, bad qa day.
Diffstat (limited to 'package/util-linux/patches/patch-config_ltmain_sh')
| -rw-r--r-- | package/util-linux/patches/patch-config_ltmain_sh | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/package/util-linux/patches/patch-config_ltmain_sh b/package/util-linux/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..76996c357 --- /dev/null +++ b/package/util-linux/patches/patch-config_ltmain_sh @@ -0,0 +1,56 @@ +--- util-linux-2.25.2.orig/config/ltmain.sh 2014-06-25 02:25:47.000000000 -0500 ++++ util-linux-2.25.2/config/ltmain.sh 2014-12-27 12:19:20.435521793 -0600 +@@ -5176,7 +5176,7 @@ func_mode_link () + ;; + -all-static | -static | -static-libtool-libs) + case $arg in +- -all-static) ++ -all-static|-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi +@@ -5185,12 +5185,6 @@ func_mode_link () + fi + prefer_static_libs=yes + ;; +- -static) +- if test -z "$pic_flag" && test -n "$link_static_flag"; then +- dlopen_self=$dlopen_self_static +- fi +- prefer_static_libs=built +- ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static +@@ -5473,7 +5467,7 @@ func_mode_link () + prevarg="$arg" + + case $arg in +- -all-static) ++ -all-static|-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" +@@ -5754,12 +5748,7 @@ func_mode_link () + continue + ;; + +- -static | -static-libtool-libs) +- # The effects of -static are defined in a previous loop. +- # We used to do the same as -all-static on platforms that +- # didn't have a PIC flag, but the assumption that the effects +- # would be equivalent was wrong. It would break on at least +- # Digital Unix and AIX. ++ -static-libtool-libs) + continue + ;; + +@@ -5853,7 +5842,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" |