| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113 |
- From 67ffe8e8582a7ba1f1d1307a419098e6dd88bdaf Mon Sep 17 00:00:00 2001
- From: Eneas U de Queiroz <[email protected]>
- Date: Tue, 20 Jul 2021 16:41:11 -0300
- Subject: openwrt: cross-compilation path adjustments
- Comments from the patch:
- 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
- OE sets installed=no in staging. We need to look in $objdir and $absdir,
- preferring $objdir. RP 31/04/2008
- This was originally commited to openwrt by Jo-Philipp Wich
- <[email protected]>.
- Signed-off-by: Eneas U de Queiroz <[email protected]>
- --- 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
|
