From 08b7f46c74f4cbe6a04759a2974bfcf91f7e737b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 9 Nov 2004 15:14:11 +0000 Subject: [PATCH] Add another check to the CC tag guessing. --- sys-devel/libtool/ChangeLog | 6 +++++- sys-devel/libtool/Manifest | 18 ++++-------------- .../1.5.2/libtool-1.5-filter-host-tags.patch | 9 ++++----- ...ibtool-1.5.2-r6 => digest-libtool-1.5.2-r7} | 0 ...1.5.2-r6.ebuild => libtool-1.5.2-r7.ebuild} | 2 +- 5 files changed, 14 insertions(+), 21 deletions(-) rename sys-devel/libtool/files/{digest-libtool-1.5.2-r6 => digest-libtool-1.5.2-r7} (100%) rename sys-devel/libtool/{libtool-1.5.2-r6.ebuild => libtool-1.5.2-r7.ebuild} (98%) diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog index 8d52aa000288..8aef6b0f3456 100644 --- a/sys-devel/libtool/ChangeLog +++ b/sys-devel/libtool/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/libtool # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.55 2004/11/04 05:13:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.56 2004/11/09 15:14:11 vapier Exp $ + + 09 Nov 2004; Mike Frysinger + files/1.5.2/libtool-1.5-filter-host-tags.patch, -libtool-1.5.2-r6.ebuild: + Add another check to the CC tag guessing. *libtool-1.5.2-r6 (04 Nov 2004) diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest index f05a1923eec7..a0a094e902dd 100644 --- a/sys-devel/libtool/Manifest +++ b/sys-devel/libtool/Manifest @@ -1,14 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 889d32a032aea8d5fa4e92d1ecd8cb72 ChangeLog 9745 +MD5 b5cffb97391952aff6de821c068e46f2 ChangeLog 9916 MD5 36f4ffb0b2fb2c36e105d0cdaaff8bcc libtool-1.5.10.ebuild 6006 MD5 8fbefdb6af5cab0e9ec3ec281b8b71a7 libtool-1.5.2-r5.ebuild 5890 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 cfbf501e65f6883cf8891c386b89a624 libtool-1.5.2-r6.ebuild 6178 -MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r6 131 +MD5 ddac894d2d0175c951a6df05aea63a12 libtool-1.5.2-r7.ebuild 6178 MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590 MD5 63416d5eb60364fb1b758f487fb81a8a files/digest-libtool-1.5.10 132 +MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r7 131 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r5 131 MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167 MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.1/libtool-1.4.1-duplicate-dependency.patch 2895 @@ -58,11 +55,4 @@ MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.p MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448 MD5 8ac4aa8ff1c680fe44447274d9f3a673 files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 882 MD5 d2313fcf3c18603f201627ca94850786 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1153 -MD5 6dd0c1d0f23c427ef0b48346e207dbfc files/1.5.2/libtool-1.5-filter-host-tags.patch 1783 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBjG0EHTu7gpaalycRAhOlAJ9kOe4AgjQ3br21OgAT5+uTNFlFcgCgwX1A -dtyXgighuj88LlnWPVMMLdo= -=IPEf ------END PGP SIGNATURE----- +MD5 25baae722fe5fa86c1db6b5b5aa9eb79 files/1.5.2/libtool-1.5-filter-host-tags.patch 1826 diff --git a/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch b/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch index 82620fbadea3..30bfbd5d58d1 100644 --- a/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch +++ b/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch @@ -7,8 +7,8 @@ + # user sometimes does CC=-gcc so we need to match that to 'gcc' + trimedcc="${CC/${host}-}" case "$base_compile " in -+ "gcc "* | " gcc "*) tagname=CC ; break ;; - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ++ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;; + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\ + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*) # The compiler in the base compile command matches @@ -18,12 +18,11 @@ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then # Evaluate the configuration. eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" -- case $base_compile in -- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) + # user sometimes does CC=-gcc so we need to match that to 'gcc' + trimedcc="${CC/${host}-}" -+ case "$base_compile " in -+ "gcc "* | " gcc "*) tagname=CC ; break ;; + case $base_compile in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ++ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;; + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\ + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*) # The compiler in $compile_command matches diff --git a/sys-devel/libtool/files/digest-libtool-1.5.2-r6 b/sys-devel/libtool/files/digest-libtool-1.5.2-r7 similarity index 100% rename from sys-devel/libtool/files/digest-libtool-1.5.2-r6 rename to sys-devel/libtool/files/digest-libtool-1.5.2-r7 diff --git a/sys-devel/libtool/libtool-1.5.2-r6.ebuild b/sys-devel/libtool/libtool-1.5.2-r7.ebuild similarity index 98% rename from sys-devel/libtool/libtool-1.5.2-r6.ebuild rename to sys-devel/libtool/libtool-1.5.2-r7.ebuild index 99c32c925e3a..e4aeb5d89060 100644 --- a/sys-devel/libtool/libtool-1.5.2-r6.ebuild +++ b/sys-devel/libtool/libtool-1.5.2-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r6.ebuild,v 1.2 2004/11/06 06:18:57 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r7.ebuild,v 1.1 2004/11/09 15:14:11 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $ inherit eutils gnuconfig -- 2.26.2