diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-11-10 04:25:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-11-10 04:25:30 +0000 |
| commit | b4d093af6b28329b2ec776a79da0f039a90ebb8b (patch) | |
| tree | cee9c8411c303cb4c7a2b158b120c4c492195a25 /sys-devel/libtool/files | |
| parent | Stable on sparc wrt security bug #70516. (diff) | |
| download | historical-b4d093af6b28329b2ec776a79da0f039a90ebb8b.tar.gz historical-b4d093af6b28329b2ec776a79da0f039a90ebb8b.tar.bz2 historical-b4d093af6b28329b2ec776a79da0f039a90ebb8b.zip | |
fix patches so they past libtool tests
Diffstat (limited to 'sys-devel/libtool/files')
| -rw-r--r-- | sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch | 12 | ||||
| -rw-r--r-- | sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch | 6 |
2 files changed, 12 insertions, 6 deletions
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 30bfbd5d58d1..26cd0a953444 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,6 +1,6 @@ --- 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,12 @@ +@@ -560,8 +560,14 @@ 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`" @@ -8,13 +8,15 @@ + trimedcc="${CC/${host}-}" case "$base_compile " in - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) -+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;; ++ "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 # the one in the tagged configuration. # Assume this is the tagged configuration we want. -@@ -947,8 +950,12 @@ +@@ -947,8 +950,14 @@ 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,7 +24,9 @@ + trimedcc="${CC/${host}-}" case $base_compile in - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) -+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;; ++ "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/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 ccaa25f7264c..d6b8cd0016af 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,13 +1,15 @@ --- 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,11 @@ +@@ -242,7 +242,13 @@ esac CC_quoted="$CC_quoted $arg" done + # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc' + trimedcc="${CC/${host}-}" case "$@ " in -+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;; ++ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) ++ tagname=CC ++ break ;; + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) # The compiler in the base compile command matches |