From d251c554f6220372ef7a30de250a8f8c6e70abe3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 12 Dec 2014 20:18:42 +0200 Subject: [PATCH] libtool: re-add patches --- .../libtool-01_dont_relink_against_host.patch | 13 +++++++++++++ .../devel/libtool/patches/libtool-02-use_ld.patch | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 packages/devel/libtool/patches/libtool-01_dont_relink_against_host.patch create mode 100644 packages/devel/libtool/patches/libtool-02-use_ld.patch diff --git a/packages/devel/libtool/patches/libtool-01_dont_relink_against_host.patch b/packages/devel/libtool/patches/libtool-01_dont_relink_against_host.patch new file mode 100644 index 0000000000..fd54ec6fc2 --- /dev/null +++ b/packages/devel/libtool/patches/libtool-01_dont_relink_against_host.patch @@ -0,0 +1,13 @@ +diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh +index 5eca4ae..23901ff 100644 +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -8333,7 +8333,7 @@ func_mode_link () + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir=-L$libdir ++ #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 diff --git a/packages/devel/libtool/patches/libtool-02-use_ld.patch b/packages/devel/libtool/patches/libtool-02-use_ld.patch new file mode 100644 index 0000000000..e98c856e8e --- /dev/null +++ b/packages/devel/libtool/patches/libtool-02-use_ld.patch @@ -0,0 +1,13 @@ +diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh +index 23901ff..df26ab5 100644 +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -7250,7 +7250,7 @@ func_mode_link () + # -stdlib=* select c++ std lib with clang + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-fuse-ld=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg"