tools/libtool: bump to 2.4.6

[openwrt/staging/hauke.git] / tools / libtool / patches / 110-dont-use-target-dir-for-relinking.patch

diff --git a/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch b/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
index be25c29e8702ee57596d5e64d394c1ad1d76166e..b76877a8b8a53b95749d70039d24cb1b265596d9 100644 (file)
--- a/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
+++ b/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
@@ -8,23 +8,25 @@ This was originally commited to openwrt by Jo-Philipp Wich
 
 Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
 
---- a/libltdl/config/ltmain.m4sh
-+++ b/libltdl/config/ltmain.m4sh
-@@ -6120,7 +6120,6 @@ func_mode_link ()
-              test "$hardcode_direct_absolute" = no; then
-             add="$libdir/$linklib"
-           elif test "$hardcode_minus_L" = yes; then
--            add_dir="-L$libdir"
-             add="-l$name"
-           elif test "$hardcode_shlibpath_var" = yes; then
-             case :$finalize_shlibpath: in
---- a/libltdl/config/ltmain.sh
-+++ b/libltdl/config/ltmain.sh
-@@ -6907,7 +6907,6 @@ func_mode_link ()
-              test "$hardcode_direct_absolute" = no; then
-             add="$libdir/$linklib"
-           elif test "$hardcode_minus_L" = yes; then
--            add_dir="-L$libdir"
-             add="-l$name"
-           elif test "$hardcode_shlibpath_var" = yes; then
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -6434,13 +6434,13 @@ func_mode_link ()
+           add_dir=
+           add=
+           # Finalize command for both is simple: just hardcode it.
+-          if test yes = "$hardcode_direct" &&
+-             test no = "$hardcode_direct_absolute"; then
+-            add=$libdir/$linklib
+-          elif test yes = "$hardcode_minus_L"; then
++          if test "$hardcode_direct" = yes &&
++             test "$hardcode_direct_absolute" = no; then
++            add="$libdir/$linklib"
++          elif test "$hardcode_minus_L" = yes; then
+             add_dir=-L$libdir
+-            add=-l$name
+-          elif test yes = "$hardcode_shlibpath_var"; then
++            add="-l$name"
++          elif test "$hardcode_shlibpath_var" = yes; then
              case :$finalize_shlibpath: in
+             *":$libdir:"*) ;;
+             *) func_append finalize_shlibpath "$libdir:" ;;