From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 30 Jan 2010 18:08:45 +0000 (+0000)
Subject: [package] libtool: Don't use the libdir path found in .la files.
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/e89fb9a6312ad0a8a288a5ceda3ac613c87914bb

[package] libtool: Don't use the libdir path found in .la files.
Fixes the build of various packages.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19422 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch
index 08c4c6806..1132c3816 100644
--- a/package/libtool/patches/100-libdir_path.patch
+++ b/package/libtool/patches/100-libdir_path.patch
@@ -10,6 +10,15 @@
  	(rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
 --- a/ltmain.in
 +++ b/ltmain.in
+@@ -2827,7 +2827,7 @@ EOF
+ 	      fi
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
++	      add_dir="-L@GLOBAL_LIBDIR@"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case $libdir in
 @@ -5669,7 +5669,7 @@ fi\
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		  exit $EXIT_FAILURE