From 2ac8b9cfe8c3f22506f227cc145e51024671fc8e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 3 Dec 2014 23:35:11 +0100 Subject: [PATCH] libtool: update to libtool-2.4.4 Signed-off-by: Stephan Raue --- packages/devel/libtool/package.mk | 3 ++- ...btool-2.4.2-dont_relink_against_host.patch | 19 ------------------- .../libtool-2.4.2-no_use_linker_plugin.patch | 13 ------------- .../patches/libtool-2.4.2-use_ld.patch | 12 ------------ 4 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 packages/devel/libtool/patches/libtool-2.4.2-dont_relink_against_host.patch delete mode 100644 packages/devel/libtool/patches/libtool-2.4.2-no_use_linker_plugin.patch delete mode 100644 packages/devel/libtool/patches/libtool-2.4.2-use_ld.patch diff --git a/packages/devel/libtool/package.mk b/packages/devel/libtool/package.mk index 35d901b2af..76a57ee4e2 100644 --- a/packages/devel/libtool/package.mk +++ b/packages/devel/libtool/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libtool" -PKG_VERSION="2.4.2" +PKG_VERSION="2.4.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -34,3 +34,4 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared" + diff --git a/packages/devel/libtool/patches/libtool-2.4.2-dont_relink_against_host.patch b/packages/devel/libtool/patches/libtool-2.4.2-dont_relink_against_host.patch deleted file mode 100644 index c11c2f576e..0000000000 --- a/packages/devel/libtool/patches/libtool-2.4.2-dont_relink_against_host.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 build i.e. when lt_sysroot is not -set it will still behave same and add -L/usr/lib to relink command - --Khem - -Index: libtool-2.4/libltdl/config/ltmain.m4sh -=================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4/libltdl/config/ltmain.m4sh -@@ -6122,7 +6122,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-2.4.2-no_use_linker_plugin.patch b/packages/devel/libtool/patches/libtool-2.4.2-no_use_linker_plugin.patch deleted file mode 100644 index 30abedba9c..0000000000 --- a/packages/devel/libtool/patches/libtool-2.4.2-no_use_linker_plugin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur libtool-2.4-old/libltdl/m4/libtool.m4 libtool-2.4-new/libltdl/m4/libtool.m4 ---- libtool-2.4-old/libltdl/m4/libtool.m4 2010-09-22 01:41:19.000000000 -0700 -+++ libtool-2.4-new/libltdl/m4/libtool.m4 2010-09-23 20:25:25.000000000 -0700 -@@ -6905,6 +6905,9 @@ - *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; - *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; - esac -+case "$CC $CFLAGS " in #( -+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -+esac - - dnl Parse the compiler output and extract the necessary - dnl objects, libraries and library flags. diff --git a/packages/devel/libtool/patches/libtool-2.4.2-use_ld.patch b/packages/devel/libtool/patches/libtool-2.4.2-use_ld.patch deleted file mode 100644 index 8db1f622e6..0000000000 --- a/packages/devel/libtool/patches/libtool-2.4.2-use_ld.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libtool-2.4-old/libltdl/config/ltmain.m4sh libtool-2.4-new/libltdl/config/ltmain.m4sh ---- libtool-2.4-old/libltdl/config/ltmain.m4sh 2010-09-22 13:16:41.000000000 -0700 -+++ libtool-2.4-new/libltdl/config/ltmain.m4sh 2010-09-22 13:21:52.000000000 -0700 -@@ -5051,7 +5051,7 @@ - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -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*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fuse-ld=*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg"