summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-05 14:32:03 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-05 14:32:03 +0000
commit2e6d580db902388c9dfa3d79871c1ba2a1d0f902 (patch)
tree3912e9231ed81c4af6e6141a6f143867155be8cc
parent2fdb008097d871072775763caa8067f18a4e02a6 (diff)
downloadpoky-2e6d580db902388c9dfa3d79871c1ba2a1d0f902.tar.gz
libtool: Upgrade 2.2.2 -> 2.2.4
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4416 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch68
-rw-r--r--meta/packages/libtool/libtool-2.2.2/fix_static.patch129
-rw-r--r--meta/packages/libtool/libtool-2.2.4/add_dolt.patch (renamed from meta/packages/libtool/libtool-2.2.2/add_dolt.patch)0
-rw-r--r--meta/packages/libtool/libtool-2.2.4/cross_compile.patch (renamed from meta/packages/libtool/libtool-2.2.2/cross_compile.patch)0
-rw-r--r--meta/packages/libtool/libtool-2.2.4/dolt.m4 (renamed from meta/packages/libtool/libtool-2.2.2/dolt.m4)0
-rw-r--r--meta/packages/libtool/libtool-2.2.4/prefix.patch (renamed from meta/packages/libtool/libtool-2.2.2/prefix.patch)0
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.4.bb (renamed from meta/packages/libtool/libtool-cross_2.2.2.bb)0
-rw-r--r--meta/packages/libtool/libtool-native_2.2.4.bb (renamed from meta/packages/libtool/libtool-native_2.2.2.bb)7
-rw-r--r--meta/packages/libtool/libtool_2.2.4.bb (renamed from meta/packages/libtool/libtool_2.2.2.bb)2
9 files changed, 7 insertions, 199 deletions
diff --git a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch b/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
deleted file mode 100644
index 4e69e2ccec..0000000000
--- a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From 92e15986a43a8009decffc4d5d290272449487a4 Mon Sep 17 00:00:00 2001
2From: Peter O'Gorman <peter@pogma.com>
3Date: Thu, 1 May 2008 12:40:24 -0500
4Subject: [PATCH] Use AC_CHECK_TOOL for otool and otool64.
5
6* libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Check.
7* libltdl/config/ltmain.m4sh (func_mode_link): Use.
8Reported by Richard Purdie <rpurdie@rpsys.net>
9---
10 ChangeLog | 7 +++++++
11 libltdl/config/ltmain.m4sh | 6 ++----
12 libltdl/m4/libtool.m4 | 6 ++++++
13 3 files changed, 15 insertions(+), 4 deletions(-)
14
15Index: libtool-2.2.2/ChangeLog
16===================================================================
17--- libtool-2.2.2.orig/ChangeLog 2008-05-01 21:34:42.000000000 +0100
18+++ libtool-2.2.2/ChangeLog 2008-05-01 21:35:47.000000000 +0100
19@@ -1,3 +1,10 @@
20+2008-05-01 Peter O'Gorman <peter@pogma.com>
21+
22+ Use AC_CHECK_TOOL for otool and otool64.
23+ * libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Check.
24+ * libltdl/config/ltmain.m4sh (func_mode_link): Use.
25+ Reported by Richard Purdie <rpurdie@rpsys.net>
26+
27 2008-04-01 Gary V. Vaughan <gary@gnu.arg>
28
29 GNU Libtool 2.2.2 was released.
30Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
31===================================================================
32--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 21:34:42.000000000 +0100
33+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 21:34:48.000000000 +0100
34@@ -4961,11 +4961,9 @@
35 done
36 if test -f "$absdir/$objdir/$depdepl" ; then
37 depdepl="$absdir/$objdir/$depdepl"
38- darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
39- darwin_install_name=`$ECHO $darwin_install_name`
40+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
41 if test -z "$darwin_install_name"; then
42- darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
43- darwin_install_name=`$ECHO $darwin_install_name`
44+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
45 fi
46 compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
47 linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
48Index: libtool-2.2.2/libltdl/m4/libtool.m4
49===================================================================
50--- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-05-01 21:34:42.000000000 +0100
51+++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-05-01 21:36:48.000000000 +0100
52@@ -893,10 +893,16 @@
53 rhapsody* | darwin*)
54 AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
55 AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
56+ AC_CHECK_TOOL([OTOOL], [otool], [:])
57+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
58 _LT_DECL([], [DSYMUTIL], [1],
59 [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
60 _LT_DECL([], [NMEDIT], [1],
61 [Tool to change global to local symbols on Mac OS X])
62+ _LT_DECL([], [OTOOL], [1],
63+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
64+ _LT_DECL([], [OTOOL64], [1],
65+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
66
67 AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
68 [lt_cv_apple_cc_single_mod=no
diff --git a/meta/packages/libtool/libtool-2.2.2/fix_static.patch b/meta/packages/libtool/libtool-2.2.2/fix_static.patch
deleted file mode 100644
index 10803c7d84..0000000000
--- a/meta/packages/libtool/libtool-2.2.2/fix_static.patch
+++ /dev/null
@@ -1,129 +0,0 @@
1From Ralf.Wildenhues@gmx.de Tue Apr 22 20:44:16 2008
2Return-Path: <Ralf.Wildenhues@gmx.de>
3X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on tim.rpsys.net
4X-Spam-Level:
5X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL,BAYES_00 autolearn=ham
6 version=3.2.4
7Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net
8 (8.13.6/8.13.8) with ESMTP id m3MJiGXW016935 for <rpurdie@[127.0.0.1]>;
9 Tue, 22 Apr 2008 20:44:16 +0100
10Received: from tim.rpsys.net ([127.0.0.1]) by localhost (tim.rpsys.net
11 [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 16773-04 for
12 <rpurdie@[127.0.0.1]>; Tue, 22 Apr 2008 20:44:07 +0100 (BST)
13Received: from merkur.ins.uni-bonn.de (merkur.ins.uni-bonn.de
14 [131.220.223.13]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id
15 m3MJi2sT016913 for <rpurdie@rpsys.net>; Tue, 22 Apr 2008 20:44:02 +0100
16Received: from localhost.localdomain (xdsl-87-79-251-12.netcologne.de
17 [87.79.251.12]) by merkur.ins.uni-bonn.de (Postfix) with ESMTP id
18 54F1C400002D4; Tue, 22 Apr 2008 21:43:56 +0200 (CEST)
19Received: from ralf by localhost.localdomain with local (Exim 4.63)
20 (envelope-from <Ralf.Wildenhues@gmx.de>) id 1JoOP7-0007yr-Aw; Tue, 22 Apr
21 2008 21:43:49 +0200
22Date: Tue, 22 Apr 2008 21:43:49 +0200
23From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
24To: Richard Purdie <rpurdie@rpsys.net>, libtool-patches@gnu.org
25Cc: libtool@gnu.org
26Subject: Re: libtool 2.2.2, ccache and -all-static
27Message-ID: <20080422194348.GE5035@ins.uni-bonn.de>
28Mail-Followup-To: Richard Purdie <rpurdie@rpsys.net>,
29 libtool-patches@gnu.org, libtool@gnu.org
30References: <1208860190.5479.8.camel@dax.rpnet.com>
31MIME-Version: 1.0
32Content-Type: text/plain; charset=us-ascii
33Content-Disposition: inline
34In-Reply-To: <1208860190.5479.8.camel@dax.rpnet.com>
35Organization: Department of Numerical Simulation, University of Bonn
36User-Agent: Mutt/1.5.17+20080114 (2008-01-14)
37X-Virus-Scanned: amavisd-new at rpsys.net
38X-Evolution-Source: imap://richard@tim.rpsys.net/
39Content-Transfer-Encoding: 8bit
40
41Hi Richard,
42
43* Richard Purdie wrote on Tue, Apr 22, 2008 at 12:29:50PM CEST:
44>
45> I've noticed another problem with two packages in poky, prelink and
46> libvorbis. Both packages have areas where LDFLAGS="-all-static" is used.
47>
48> The problem comes about since Poky sets CC to "ccache gcc", then libtool
49> puts the -static flag between ccache and gcc.
50
51Thanks for the bug report, and especially for providing an example to
52reproduce it!
53
54> libtool: link: ccache -static gcc -O20 -ffast-math -D_REENTRANT -fsigned-char -DUSE_MEMORY_H -o decoder_example decoder_example.o ../lib/.libs/libvorbis.a -lm /usr/lib/libogg.a
55
56Confirmed. Fixed as below, committed, put you in THANKS.
57
58Cheers,
59Ralf
60
612008-04-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
62
63 Fix regression over 1.5.26 with ccache $CC -all-static.
64 * libltdl/config/ltmain.m4sh (func_mode_link): Add
65 $link_static_flag to compile_command and link_command only
66 later, instead of right after a possible compiler wrapper.
67 * tests/static.at (ccache -all-static): New test.
68 * THANKS: Update.
69 Report by Richard Purdie.
70
71diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
72index ff1e50d..ac334dc 100644
73--- a/libltdl/config/ltmain.m4sh
74+++ b/libltdl/config/ltmain.m4sh
75@@ -3160,9 +3160,6 @@ func_mode_link ()
76 fi
77 if test -n "$link_static_flag"; then
78 dlopen_self=$dlopen_self_static
79- # See comment for -static flag below, for more details.
80- func_append compile_command " $link_static_flag"
81- func_append finalize_command " $link_static_flag"
82 fi
83 prefer_static_libs=yes
84 ;;
85@@ -3450,7 +3447,11 @@ func_mode_link ()
86
87 case $arg in
88 -all-static)
89- # The effects of -all-static are defined in a previous loop.
90+ if test -n "$link_static_flag"; then
91+ # See comment for -static flag below, for more details.
92+ func_append compile_command " $link_static_flag"
93+ func_append finalize_command " $link_static_flag"
94+ fi
95 continue
96 ;;
97
98diff --git a/tests/static.at b/tests/static.at
99index 74b1c63..1a51d0d 100644
100--- a/tests/static.at
101+++ b/tests/static.at
102@@ -352,3 +352,26 @@ for withdep in no yes; do
103 done
104
105 AT_CLEANUP
106+
107+
108+AT_SETUP([ccache -all-static])
109+
110+AT_DATA([ccache],
111+[[#! /bin/sh
112+# poor man's ccache clone
113+case $1 in
114+-*) echo "bogus argument: $1" >&2; exit 1 ;;
115+esac
116+exec "$@"
117+]])
118+chmod +x ./ccache
119+
120+AT_DATA([a.c],
121+[[int main(void) { return 0; }
122+]])
123+
124+AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c], [], [ignore])
125+AT_CHECK([$LIBTOOL --mode=link --tag=CC ./ccache $CC $CFLAGS $LDFLAGS -all-static a.$OBJEXT -o a],
126+ [], [ignore])
127+
128+AT_CLEANUP
129
diff --git a/meta/packages/libtool/libtool-2.2.2/add_dolt.patch b/meta/packages/libtool/libtool-2.2.4/add_dolt.patch
index 2c5df96031..2c5df96031 100644
--- a/meta/packages/libtool/libtool-2.2.2/add_dolt.patch
+++ b/meta/packages/libtool/libtool-2.2.4/add_dolt.patch
diff --git a/meta/packages/libtool/libtool-2.2.2/cross_compile.patch b/meta/packages/libtool/libtool-2.2.4/cross_compile.patch
index b4bacbd12f..b4bacbd12f 100644
--- a/meta/packages/libtool/libtool-2.2.2/cross_compile.patch
+++ b/meta/packages/libtool/libtool-2.2.4/cross_compile.patch
diff --git a/meta/packages/libtool/libtool-2.2.2/dolt.m4 b/meta/packages/libtool/libtool-2.2.4/dolt.m4
index 9bedecf273..9bedecf273 100644
--- a/meta/packages/libtool/libtool-2.2.2/dolt.m4
+++ b/meta/packages/libtool/libtool-2.2.4/dolt.m4
diff --git a/meta/packages/libtool/libtool-2.2.2/prefix.patch b/meta/packages/libtool/libtool-2.2.4/prefix.patch
index 639feb7456..639feb7456 100644
--- a/meta/packages/libtool/libtool-2.2.2/prefix.patch
+++ b/meta/packages/libtool/libtool-2.2.4/prefix.patch
diff --git a/meta/packages/libtool/libtool-cross_2.2.2.bb b/meta/packages/libtool/libtool-cross_2.2.4.bb
index 797aca827d..797aca827d 100644
--- a/meta/packages/libtool/libtool-cross_2.2.2.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.4.bb
diff --git a/meta/packages/libtool/libtool-native_2.2.2.bb b/meta/packages/libtool/libtool-native_2.2.4.bb
index 5b632c8a2e..66cc0f1a1a 100644
--- a/meta/packages/libtool/libtool-native_2.2.2.bb
+++ b/meta/packages/libtool/libtool-native_2.2.4.bb
@@ -10,6 +10,13 @@ S = "${WORKDIR}/libtool-${PV}"
10 10
11inherit native 11inherit native
12 12
13do_configure_prepend () {
14 # Remove any existing libtool m4 since old stale versions would break
15 # any upgrade
16 rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
17 rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
18}
19
13do_stage () { 20do_stage () {
14 install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool 21 install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
15 install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize 22 install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
diff --git a/meta/packages/libtool/libtool_2.2.2.bb b/meta/packages/libtool/libtool_2.2.4.bb
index 7bb5945a3a..624fc5c046 100644
--- a/meta/packages/libtool/libtool_2.2.2.bb
+++ b/meta/packages/libtool/libtool_2.2.4.bb
@@ -3,8 +3,6 @@ require libtool.inc
3PR = "r10" 3PR = "r10"
4 4
5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
6 file://fix_static.patch;patch=1;status=merged \
7 file://Use-AC_CHECK_TOOL-for-otool-and-otool64.patch;patch=1;status=merged \
8 file://dolt.m4" 6 file://dolt.m4"
9S = "${WORKDIR}/libtool-${PV}" 7S = "${WORKDIR}/libtool-${PV}"
10 8