diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-09-29 23:32:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-29 23:32:09 +0000 |
| commit | 4e114111280d0dbba01e4198e991cf610da9469b (patch) | |
| tree | 91e14caa0d5d6ae678fb5b32206e11f7842948a1 /sys-devel/libtool/files | |
| parent | stable on x86 (diff) | |
| download | historical-4e114111280d0dbba01e4198e991cf610da9469b.tar.gz historical-4e114111280d0dbba01e4198e991cf610da9469b.tar.bz2 historical-4e114111280d0dbba01e4198e991cf610da9469b.zip | |
Update the host tags patch to handle the case where user changes their CHOST but doesnt re-emerge libtool.
Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501
Diffstat (limited to 'sys-devel/libtool/files')
| -rw-r--r-- | sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch | 6 |
1 files changed, 5 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 e418b43ea4f3..de8ad9269792 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 @@ -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. |