summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-01-19 23:27:44 +0000
committerMike Frysinger <vapier@gentoo.org>2005-01-19 23:27:44 +0000
commitb74315edf9c1451b6d678849d3cb9e63a2041cab (patch)
tree96e053add866729337b69b2c6e1e2d25d784f78d /sys-devel/libtool/files
parentmake sure $ROOT has a trailing / (diff)
downloadgentoo-2-b74315edf9c1451b6d678849d3cb9e63a2041cab.tar.gz
gentoo-2-b74315edf9c1451b6d678849d3cb9e63a2041cab.tar.bz2
gentoo-2-b74315edf9c1451b6d678849d3cb9e63a2041cab.zip
Update the infer tag patch to go both ways #77921.
(Portage version: 2.0.51-r13)
Diffstat (limited to 'sys-devel/libtool/files')
-rw-r--r--sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch5
1 files changed, 4 insertions, 1 deletions
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 9145bc76cdca..d70b1b7befc2 100644
--- 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
@@ -1,16 +1,19 @@
--- libtool-1.5.10/ltmain.in.orig 2004-11-09 13:43:24.290875562 -0500
+++ libtool-1.5.10/ltmain.in 2004-11-09 13:45:51.250048464 -0500
-@@ -242,7 +242,13 @@
+@@ -242,7 +242,16 @@
esac
CC_quoted="$CC_quoted $arg"
done
+ # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+ trimedcc=`echo ${CC} | $SED -e "/${host}-//g"`
++ # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
++ extendcc=${host}-${CC}
case "$@ " in
+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+ tagname=CC
+ break ;;
+ "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
++ "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
" $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.