|
@@ -0,0 +1,56 @@
|
|
|
|
+--- libtool-2.4.2.orig/libltdl/config/ltmain.sh 2011-10-17 12:19:35.000000000 +0200
|
|
|
|
++++ libtool-2.4.2/libltdl/config/ltmain.sh 2014-08-15 15:01:04.000000000 +0200
|
|
|
|
+@@ -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"
|