diff options
Diffstat (limited to 'support/libtool/buildroot-libtool-v1.5.patch')
| -rw-r--r-- | support/libtool/buildroot-libtool-v1.5.patch | 56 |
1 files changed, 49 insertions, 7 deletions
diff --git a/support/libtool/buildroot-libtool-v1.5.patch b/support/libtool/buildroot-libtool-v1.5.patch index 57a7c58e3b..73a61b0ccd 100644 --- a/support/libtool/buildroot-libtool-v1.5.patch +++ b/support/libtool/buildroot-libtool-v1.5.patch @@ -1,6 +1,6 @@ ---- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500 -+++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400 -@@ -273,8 +273,9 @@ func_infer_tag () +--- a/ltmain.sh 2008-02-01 17:39:51.000000000 +0100 ++++ b/ltmain.sh 2014-07-30 22:36:00.544715335 +0200 +@@ -297,8 +297,9 @@ # line option must be used. if test -z "$tagname"; then $echo "$modename: unable to infer tagged configuration" @@ -12,7 +12,49 @@ # else # $echo "$modename: using $tagname tagged configuration" fi -@@ -2407,8 +2408,14 @@ EOF +@@ -1178,7 +1179,8 @@ + case $arg in + -all-static | -static | -static-libtool-libs) + case $arg in +- -all-static) ++ # Make -static behave like -all-static ++ -all-static | -static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 + fi +@@ -1187,12 +1189,6 @@ + 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 +@@ -1482,7 +1478,8 @@ + prevarg="$arg" + + case $arg in +- -all-static) ++ # Make -static behave like -all-static ++ -all-static | -static) + if test -n "$link_static_flag"; then + compile_command="$compile_command $link_static_flag" + finalize_command="$finalize_command $link_static_flag" +@@ -1765,7 +1762,7 @@ + continue + ;; + +- -static | -static-libtool-libs) ++ -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 +@@ -2462,8 +2459,14 @@ absdir="$abs_ladir" libdir="$abs_ladir" else @@ -29,7 +71,7 @@ fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else -@@ -2545,7 +2552,7 @@ EOF +@@ -2602,7 +2605,7 @@ { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" @@ -38,7 +80,7 @@ fi # This is a shared library -@@ -5606,6 +5623,10 @@ fi\ +@@ -5687,6 +5690,10 @@ # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do @@ -49,7 +91,7 @@ case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -@@ -5927,10 +5948,13 @@ relink_command=\"$relink_command\"" +@@ -6008,10 +6015,13 @@ # At present, this check doesn't affect windows .dll's that # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. |
