2010-12-21 22:37:54 +00:00
|
|
|
--- a/libltdl/config/ltmain.m4sh
|
|
|
|
|
+++ b/libltdl/config/ltmain.m4sh
|
|
|
|
|
@@ -5715,8 +5715,14 @@ func_mode_link ()
|
2010-12-18 18:07:53 +00:00
|
|
|
absdir="$abs_ladir"
|
|
|
|
|
libdir="$abs_ladir"
|
|
|
|
|
else
|
|
|
|
|
- dir="$lt_sysroot$libdir"
|
|
|
|
|
- absdir="$lt_sysroot$libdir"
|
|
|
|
|
+ # Adding 'libdir' from the .la file to our library search paths
|
|
|
|
|
+ # breaks crosscompilation horribly. We cheat here and don't add
|
|
|
|
|
+ # it, instead adding the path where we found the .la. -CL
|
|
|
|
|
+ dir="$lt_sysroot$abs_ladir"
|
|
|
|
|
+ absdir="$abs_ladir"
|
|
|
|
|
+ libdir="$abs_ladir"
|
|
|
|
|
+ #dir="$libdir"
|
|
|
|
|
+ #absdir="$lt_sysroot$libdir"
|
|
|
|
|
fi
|
|
|
|
|
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
|
|
|
|
|
else
|
2010-12-21 22:37:54 +00:00
|
|
|
@@ -6114,8 +6120,6 @@ func_mode_link ()
|
2010-12-18 18:07:53 +00:00
|
|
|
add="$libdir/$linklib"
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
- # We cannot seem to hardcode it, guess we'll fake it.
|
|
|
|
|
- add_dir="-L$libdir"
|
|
|
|
|
# Try looking first in the location we're being installed to.
|
|
|
|
|
if test -n "$inst_prefix_dir"; then
|
|
|
|
|
case $libdir in
|
2010-12-21 22:37:54 +00:00
|
|
|
@@ -6270,7 +6274,17 @@ func_mode_link ()
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
- path="-L$absdir/$objdir"
|
|
|
|
|
+ # OE sets installed=no in staging. We need to look in $objdir and $absdir,
|
|
|
|
|
+ # preferring $objdir. RP 31/04/2008
|
|
|
|
|
+ if test -f "$absdir/$objdir/$depdepl" ; then
|
|
|
|
|
+ depdepl="$absdir/$objdir/$depdepl"
|
|
|
|
|
+ path="-L$absdir/$objdir"
|
|
|
|
|
+ elif test -f "$absdir/$depdepl" ; then
|
|
|
|
|
+ depdepl="$absdir/$depdepl"
|
|
|
|
|
+ path="-L$absdir"
|
|
|
|
|
+ else
|
|
|
|
|
+ path="-L$absdir/$objdir"
|
|
|
|
|
+ fi
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
else
|
|
|
|
|
--- a/libltdl/config/ltmain.sh
|
|
|
|
|
+++ b/libltdl/config/ltmain.sh
|
|
|
|
|
@@ -6504,8 +6504,14 @@ func_mode_link ()
|
|
|
|
|
absdir="$abs_ladir"
|
|
|
|
|
libdir="$abs_ladir"
|
|
|
|
|
else
|
|
|
|
|
- dir="$lt_sysroot$libdir"
|
|
|
|
|
- absdir="$lt_sysroot$libdir"
|
|
|
|
|
+ # Adding 'libdir' from the .la file to our library search paths
|
|
|
|
|
+ # breaks crosscompilation horribly. We cheat here and don't add
|
|
|
|
|
+ # it, instead adding the path where we found the .la. -CL
|
|
|
|
|
+ dir="$lt_sysroot$abs_ladir"
|
|
|
|
|
+ absdir="$abs_ladir"
|
|
|
|
|
+ libdir="$abs_ladir"
|
|
|
|
|
+ #dir="$libdir"
|
|
|
|
|
+ #absdir="$lt_sysroot$libdir"
|
|
|
|
|
fi
|
|
|
|
|
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
|
|
|
|
|
else
|
|
|
|
|
@@ -6903,8 +6909,6 @@ func_mode_link ()
|
|
|
|
|
add="$libdir/$linklib"
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
- # We cannot seem to hardcode it, guess we'll fake it.
|
|
|
|
|
- add_dir="-L$libdir"
|
|
|
|
|
# Try looking first in the location we're being installed to.
|
|
|
|
|
if test -n "$inst_prefix_dir"; then
|
|
|
|
|
case $libdir in
|
|
|
|
|
@@ -7059,7 +7063,17 @@ func_mode_link ()
|
2010-12-18 18:07:53 +00:00
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
- path="-L$absdir/$objdir"
|
|
|
|
|
+ # OE sets installed=no in staging. We need to look in $objdir and $absdir,
|
|
|
|
|
+ # preferring $objdir. RP 31/04/2008
|
|
|
|
|
+ if test -f "$absdir/$objdir/$depdepl" ; then
|
|
|
|
|
+ depdepl="$absdir/$objdir/$depdepl"
|
|
|
|
|
+ path="-L$absdir/$objdir"
|
|
|
|
|
+ elif test -f "$absdir/$depdepl" ; then
|
|
|
|
|
+ depdepl="$absdir/$depdepl"
|
|
|
|
|
+ path="-L$absdir"
|
|
|
|
|
+ else
|
|
|
|
|
+ path="-L$absdir/$objdir"
|
|
|
|
|
+ fi
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
else
|
