diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-07-05 12:09:29 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-07-06 10:29:54 +0000 |
| commit | eb4fa0769592ff82e390bc60e408163dbbd93eeb (patch) | |
| tree | 9108b8383167bd3e5ed55f549ddb10fcd19690d2 /main/libtool/libtool-fix-cross-compile.patch | |
| parent | 658ce467c6b897f1ad5e3b90df18444e34cc9bdf (diff) | |
| download | aports-eb4fa0769592ff82e390bc60e408163dbbd93eeb.tar.bz2 aports-eb4fa0769592ff82e390bc60e408163dbbd93eeb.tar.xz | |
main/libtool: fix a cross compile issue
Diffstat (limited to 'main/libtool/libtool-fix-cross-compile.patch')
| -rw-r--r-- | main/libtool/libtool-fix-cross-compile.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/main/libtool/libtool-fix-cross-compile.patch b/main/libtool/libtool-fix-cross-compile.patch new file mode 100644 index 0000000000..585897e0de --- /dev/null +++ b/main/libtool/libtool-fix-cross-compile.patch @@ -0,0 +1,36 @@ +--- libtool-2.4.6.orig/build-aux/ltmain.in ++++ libtool-2.4.6/build-aux/ltmain.in +@@ -6449,7 +6449,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 +@@ -7628,9 +7628,11 @@ + test relink = "$opt_mode" || rpath=$compile_rpath$rpath + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result ++ func_stripname '=' '' "$libdir" ++ libdir=$func_stripname_result + if test -n "$hardcode_libdir_separator"; then +- func_replace_sysroot "$libdir" +- libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir + else +@@ -8360,6 +8362,10 @@ + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result ++ func_stripname '=' '' "$libdir" ++ libdir=$func_stripname_result + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir |