void-packages/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch
Jürgen Buchmüller ece98763f4 libtool: update to 2.4.6
I adapted the patches to enable cross compiling to the
new file hierarchy and line numbers:
+ configure and libltdl/configure have just different line numbers
+ libltdl/config/ltmain.m4sh was replaced with build-aux/ltmain.{in,sh}
+ tests/cdemo does no longer exist
+ patched tests/testsuite and tests/sysroot.at instead
+ had to add --force to ./bootstrap

+ gmp now needs to run autoreconf -if for cross compile case
+ libarchive -"-

I successfully built for x86_64 and cross built for armv[67]hf e.g.
`alsa-lib` for a test. However, this pr needs to be scrutinized before merge.
2015-10-21 12:00:49 +02:00

21 lines
793 B
Diff

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>
Adapted to libtool-2.4.6 build-aux/ltmain.in
Jürgen Buchmüller <pullmoll@t-online.de>
--- build-aux/ltmain.in 2015-02-06 13:57:56.000000000 +0100
+++ build-aux/ltmain.in 2015-10-20 13:40:29.959988582 +0200
@@ -6456,7 +6456,7 @@
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