diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-11-05 16:59:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-11-05 16:59:22 +0000 |
| commit | c0f7378abcfebd8b537cee52de49d6b3f946d040 (patch) | |
| tree | b145a6b77bae988d49b7f8d991243c8d7b4cd550 /sys-devel | |
| parent | Added version strings to cjk fonts. (diff) | |
| download | historical-c0f7378abcfebd8b537cee52de49d6b3f946d040.tar.gz historical-c0f7378abcfebd8b537cee52de49d6b3f946d040.tar.bz2 historical-c0f7378abcfebd8b537cee52de49d6b3f946d040.zip | |
update patch to handle CC tag guessing
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/libtool/Manifest | 8 | ||||
| -rw-r--r-- | sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest index ae8094e45a90..9c6f3585324d 100644 --- a/sys-devel/libtool/Manifest +++ b/sys-devel/libtool/Manifest @@ -58,11 +58,11 @@ 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 055538f9759547fa48053a0ff9f4aa44 files/1.5.2/libtool-1.5-filter-host-tags.patch 1687 +MD5 6dd0c1d0f23c427ef0b48346e207dbfc files/1.5.2/libtool-1.5-filter-host-tags.patch 1783 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBibq6HTu7gpaalycRAoSWAKChFi9NT8RvV4JLpElScXd9IDLqBACgoi3J -urRZClHwVEsF6G9aHm4TadA= -=I/Gb +iD8DBQFBi7GiHTu7gpaalycRAmiOAJ9gWs5Z79CuO36BWDMKcD41sbKVzgCgtudr +gk32hK/tSsU5OBEYITalv1E= +=eW85 -----END PGP SIGNATURE----- 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 4db84bb45fe5..82620fbadea3 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 @@ -1,19 +1,20 @@ --- libtool-1.5.2/ltmain.in.orig 2004-11-04 04:20:50.608823576 +0000 +++ libtool-1.5.2/ltmain.in 2004-11-04 04:23:25.151329544 +0000 -@@ -560,8 +560,11 @@ +@@ -560,8 +560,12 @@ 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`" + # user sometimes does CC=<HOST>-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` "*) + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\ + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. -@@ -947,8 +950,11 @@ +@@ -947,8 +950,12 @@ 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`" @@ -22,6 +23,7 @@ + # user sometimes does CC=<HOST>-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` "*|\ + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*) # The compiler in $compile_command matches |