Update the host tags patch to handle the case where user changes their CHOST but...

Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index d92e9cb6af31fb290c7af61b3119a756e4a47efb..f0d66482f33bbba59507d6ab1ffee75a9737fe77 100644 (file)
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.85 2005/09/25 08:41:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.86 2005/09/29 23:32:09 vapier Exp $
+
+  29 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  files/1.5.6/libtool-1.5-filter-host-tags.patch:
+  Update the host tags patch to handle the case where user changes their CHOST
+  but doesnt re-emerge libtool.
 
   25 Sep 2005; Mike Frysinger <vapier@gentoo.org>
   files/1.5.10/libtool-1.5.10-version-checking.patch,

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 26431161ba570db416d7e2dbfb8e76dc95b6d7fc..a8fb7e1e6b76bac03c56c9c60c9f06e1441bbe8b 100644 (file)
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -6,7 +6,7 @@ MD5 50b3b9fe1d346665231c739e48d616b6 libtool-1.5.18-r1.ebuild 5181
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
 MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
-MD5 7bc30e3440e0a69be2ad7861f056b7d1 ChangeLog 14848
+MD5 1178e416fa07c24aaf5bcbb9b93d0ddd ChangeLog 15060
 MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
 MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
 MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
@@ -16,7 +16,7 @@ MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
 MD5 7e914d56a9e704e071b385ca3380a974 files/1.5.10/libtool-1.5.10-version-checking.patch 1841
 MD5 6a91891583a50a0bc2124ee61814b7b8 files/1.5.10/libtool-1.5.10-portage.patch 2895
 MD5 2196d46d17a239f4b4d7629ca264a9ff files/1.5.10/libtool-1.5.10-locking.patch 513
-MD5 2badc5a56ce45a238edbef00b20677f7 files/1.5.6/libtool-1.5-filter-host-tags.patch 1146
+MD5 eea7fbac7b23154feebdfb9ad0951569 files/1.5.6/libtool-1.5-filter-host-tags.patch 1426
 MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
 MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
 MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
@@ -38,7 +38,7 @@ MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDNmLjgIKl8Uu19MoRAp9aAJ9bVtPOdwUWNnJw9nzRXCU/bsXLQwCdGbxC
-FDg0fDc4u6CqxdBpgPshJkM=
-=OWmp
+iD8DBQFDPHm7gIKl8Uu19MoRApDSAJwNIGqRaxdW3BAZuuvka6qbxg16HACfRWVT
+GUgGq5BKdEhB7sGVQNH1bpo=
+=iW2+
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch b/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
index e418b43ea4f363b39fddb77981eb6afcc7669419..de8ad9269792d57b296bd5f890f99fc8516677f7 100644 (file)
--- a/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
+++ b/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch
@@ -5,7 +5,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=77921
 
 --- libtool-1.5.10/ltmain.in
 +++ libtool-1.5.10/ltmain.in
-@@ -242,7 +242,17 @@
+@@ -242,7 +242,21 @@
            esac
            CC_quoted="$CC_quoted $arg"
          done
@@ -13,6 +13,9 @@ http://bugs.gentoo.org/show_bug.cgi?id=77921
 +          trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
 +          # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
 +          extendcc=${host}-${CC}
++          # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc  
++          # (Gentoo-specific hack because we always export $CHOST)
++          mungedcc=${CHOST-${host}}-${trimedcc}
            case "$@ " in
 +            "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
 +            "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
@@ -20,6 +23,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=77921
 +            break ;;
 +            "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
 +            "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
++            "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
              " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
              # The compiler in the base compile command matches
              # the one in the tagged configuration.