From patchwork Wed Aug 6 19:16:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 377348 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id BAE6A1400AA for ; Thu, 7 Aug 2014 05:17:11 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id DC26E3FD8F for ; Wed, 6 Aug 2014 21:17:09 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-we0-f176.google.com (mail-we0-f176.google.com [74.125.82.176]) by hugin.dotsrc.org (Postfix) with ESMTPS id A714D3FB81 for ; Wed, 6 Aug 2014 21:17:07 +0200 (CEST) Received: by mail-we0-f176.google.com with SMTP id q58so3060704wes.35 for ; Wed, 06 Aug 2014 12:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MrHaYZlmXcfYwmLJlcdhzUCfURsDBQrN1uizWwHaeRQ=; b=OCAAtdDvjZBkTguqFyvjZF6UjNPB6kefKB43LXQhoSrR/kCITW39fJZnfGtamE6roD COhYq2IJTQlKf2CR7z1+tSP9/ZRfViDucT0DUk6LdBFhY8IrfAdLGTUPKaHLZgvSMrKX KpRm+VrBFb+b9fBZixMy4ExSPs14mAmoF50diH0R65m68lhdXICEwPtS3fe3RccWryHe pnRiIPp6rPrpa7wp3+40PQCp8QOAvLKsobLCOSR6A9qw+nEIsMVFicHMBGd1HOpHKGlB ZXWV3KADqJxPk5fSC16fuGCL2Bzo9Yd95JT109XwIaXiZjdKzMiQPCl5qkXvUSBuHUyW Z9PQ== X-Received: by 10.180.37.241 with SMTP id b17mr52351300wik.70.1407352627048; Wed, 06 Aug 2014 12:17:07 -0700 (PDT) Received: from localhost.localdomain (mut38-h01-31-33-249-220.dsl.sta.abo.bbox.fr. [31.33.249.220]) by mx.google.com with ESMTPSA id ej10sm21057792wib.12.2014.08.06.12.17.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 12:17:06 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 05/20] libtool: Upgrade to 2.4.2 Date: Wed, 6 Aug 2014 21:16:36 +0200 Message-Id: <1407352611-7652-5-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1407352611-7652-1-git-send-email-diorcet.yann@gmail.com> References: <1407352611-7652-1-git-send-email-diorcet.yann@gmail.com> X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- recipes/libtool/libtool-2.2.10/lzma_removed.patch | 12 ------ recipes/libtool/libtool-2.4.2/cross_compile.patch | 43 ++++++++++++++++++++++ .../default-bindir.patch | 0 recipes/libtool/libtool-2.4.2/syslib.patch | 30 +++++++++++++++ .../libtool/{libtool-2.2.inc => libtool-2.4.inc} | 0 recipes/libtool/libtool_2.2.10.oe.sig | 1 - .../{libtool_2.2.10.oe => libtool_2.4.2.oe} | 13 ++++--- recipes/libtool/libtool_2.4.2.oe.sig | 1 + 8 files changed, 82 insertions(+), 18 deletions(-) delete mode 100644 recipes/libtool/libtool-2.2.10/lzma_removed.patch create mode 100644 recipes/libtool/libtool-2.4.2/cross_compile.patch rename recipes/libtool/{libtool-2.2.10 => libtool-2.4.2}/default-bindir.patch (100%) create mode 100644 recipes/libtool/libtool-2.4.2/syslib.patch rename recipes/libtool/{libtool-2.2.inc => libtool-2.4.inc} (100%) delete mode 100644 recipes/libtool/libtool_2.2.10.oe.sig rename recipes/libtool/{libtool_2.2.10.oe => libtool_2.4.2.oe} (51%) create mode 100644 recipes/libtool/libtool_2.4.2.oe.sig diff --git a/recipes/libtool/libtool-2.2.10/lzma_removed.patch b/recipes/libtool/libtool-2.2.10/lzma_removed.patch deleted file mode 100644 index 70ce57b..0000000 --- a/recipes/libtool/libtool-2.2.10/lzma_removed.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libtool-2.2.10/configure.ac libtool-2.2.10.mod/configure.ac ---- libtool-2.2.10/configure.ac 2010-06-09 15:00:04.000000000 +0200 -+++ libtool-2.2.10.mod/configure.ac 2012-10-10 01:35:44.000000000 +0200 -@@ -122,7 +122,7 @@ - - dnl These are bootstrap requirements! Once built, libtool may work with - dnl much older releases of autoconf and automake. See release notes. --AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects dist-lzma]) -+AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects]) - - dnl We use m4sh to generate libtool's portable shell scripts - AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh']) diff --git a/recipes/libtool/libtool-2.4.2/cross_compile.patch b/recipes/libtool/libtool-2.4.2/cross_compile.patch new file mode 100644 index 0000000..149a17f --- /dev/null +++ b/recipes/libtool/libtool-2.4.2/cross_compile.patch @@ -0,0 +1,43 @@ +diff -urN a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh +--- a/libltdl/config/ltmain.m4sh 2011-10-17 12:17:05.000000000 +0200 ++++ b/libltdl/config/ltmain.m4sh 2013-10-22 17:50:24.921016169 +0200 +@@ -5731,8 +5731,9 @@ + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$lt_sysroot$libdir" +- absdir="$lt_sysroot$libdir" ++ dir="$abs_ladir" ++ absdir="$abs_ladir" ++ libdir="$abs_ladir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -6130,8 +6131,6 @@ + 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 +6285,17 @@ + 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 diff --git a/recipes/libtool/libtool-2.2.10/default-bindir.patch b/recipes/libtool/libtool-2.4.2/default-bindir.patch similarity index 100% rename from recipes/libtool/libtool-2.2.10/default-bindir.patch rename to recipes/libtool/libtool-2.4.2/default-bindir.patch diff --git a/recipes/libtool/libtool-2.4.2/syslib.patch b/recipes/libtool/libtool-2.4.2/syslib.patch new file mode 100644 index 0000000..912c010 --- /dev/null +++ b/recipes/libtool/libtool-2.4.2/syslib.patch @@ -0,0 +1,30 @@ +diff -urN a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh +--- a/libltdl/config/ltmain.m4sh 2011-10-17 12:17:05.000000000 +0200 ++++ b/libltdl/config/ltmain.m4sh 2014-04-02 23:19:35.179802667 +0200 +@@ -5397,9 +5397,9 @@ + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; then +- searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs" + else +- searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ searchdirs="$newlib_search_path $lib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do +diff -urN a/libltdl/config/ltmain.sh b/libltdl/config/ltmain.sh +--- a/libltdl/config/ltmain.sh 2011-10-17 12:19:35.000000000 +0200 ++++ b/libltdl/config/ltmain.sh 2014-04-02 23:19:20.428198693 +0200 +@@ -6184,9 +6184,9 @@ + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; then +- searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs" + else +- searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ searchdirs="$newlib_search_path $lib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do diff --git a/recipes/libtool/libtool-2.2.inc b/recipes/libtool/libtool-2.4.inc similarity index 100% rename from recipes/libtool/libtool-2.2.inc rename to recipes/libtool/libtool-2.4.inc diff --git a/recipes/libtool/libtool_2.2.10.oe.sig b/recipes/libtool/libtool_2.2.10.oe.sig deleted file mode 100644 index b29f5a6..0000000 --- a/recipes/libtool/libtool_2.2.10.oe.sig +++ /dev/null @@ -1 +0,0 @@ -e8fa9813d8e9a5497c636744e6fd3f55d86eec38 libtool-2.2.10.tar.gz diff --git a/recipes/libtool/libtool_2.2.10.oe b/recipes/libtool/libtool_2.4.2.oe similarity index 51% rename from recipes/libtool/libtool_2.2.10.oe rename to recipes/libtool/libtool_2.4.2.oe index df5e62d..d8fe10a 100644 --- a/recipes/libtool/libtool_2.2.10.oe +++ b/recipes/libtool/libtool_2.4.2.oe @@ -1,17 +1,20 @@ LICENSE = "GPL-2.0+" LICENSE_${PN}-libltdl = "LGPL-2.1+" -require libtool-2.2.inc +require libtool-2.4.inc -SRC_URI += "file://lzma_removed.patch" +SRC_URI += "file://syslib.patch" + +libtool_cross_compile = "" +libtool_cross_compile:cross = "file://cross_compile.patch" +libtool_cross_compile:sdk-cross = "file://cross_compile.patch" +SRC_URI += "${libtool_cross_compile}" addtask bootstrap before configure after fetch unpack patch stage do_bootstrap[dirs] = "${S}" do_bootstrap () { - if [ "${RECIPE_TYPE}" != "native" ]; then - ./bootstrap - fi + ./bootstrap } SRC_URI:>TARGET_LIBC_mingw = " file://default-bindir.patch" diff --git a/recipes/libtool/libtool_2.4.2.oe.sig b/recipes/libtool/libtool_2.4.2.oe.sig new file mode 100644 index 0000000..20f70c3 --- /dev/null +++ b/recipes/libtool/libtool_2.4.2.oe.sig @@ -0,0 +1 @@ +22b71a8b5ce3ad86e1094e7285981cae10e6ff88 libtool-2.4.2.tar.gz