libtool: merge some patches from yocto for cross builds.

This commit is contained in:
Juan RP 2013-02-06 10:50:14 +01:00
parent 0fffda3b45
commit 3617ce499e
6 changed files with 862 additions and 47 deletions

View file

@ -0,0 +1,18 @@
When using sysroot we should append it to libdir, which is helpful in
cross builds as the system is staged in the sysroot. For normal builds,
i.e. when lt_sysroot is not set, it will still behave the same and add
-L/usr/lib to the relink command.
-Khem Raj <raj.khem@gmail.com>
--- libltdl/config/ltmain.m4sh
+++ libltdl/config/ltmain.m4sh
@@ -6122,7 +6122,7 @@ func_mode_link ()
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ add_dir="-L$lt_sysroot$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in