mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
96e05e2e36
This breaks the package builds using the SDK.
The targets all build fine, but the package builder fails on many
packages. The package builder uses the OpenWrt SDK.
This reverts commit c377d874be.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
95 lines
3.1 KiB
Diff
95 lines
3.1 KiB
Diff
--- a/libltdl/config/ltmain.m4sh
|
|
+++ b/libltdl/config/ltmain.m4sh
|
|
@@ -5731,8 +5731,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
|
|
@@ -6130,8 +6136,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
|
|
@@ -6286,7 +6290,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
|
|
@@ -6518,8 +6518,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
|
|
@@ -6917,8 +6923,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
|
|
@@ -7073,7 +7077,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
|