diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-07 05:42:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-07 05:42:19 +0000 |
| commit | 0962774f9ce1d4cce7493765799b291ec6e2c36b (patch) | |
| tree | 901af2365fa438e11b7d283640d592a551367be0 /sys-devel | |
| parent | Update nacl-toolchain-newlib dependency. (diff) | |
| download | gentoo-2-0962774f9ce1d4cce7493765799b291ec6e2c36b.tar.gz gentoo-2-0962774f9ce1d4cce7493765799b291ec6e2c36b.tar.bz2 gentoo-2-0962774f9ce1d4cce7493765799b291ec6e2c36b.zip | |
Fix multilib support with @GENTOO_LIBDIR@.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc-config/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/gcc-config/files/gcc-config-1.4.1 | 8 | ||||
| -rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.5 | 8 |
3 files changed, 13 insertions, 9 deletions
diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog index bfcdaab940ef..875215ffb48e 100644 --- a/sys-devel/gcc-config/ChangeLog +++ b/sys-devel/gcc-config/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gcc-config # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.197 2011/11/11 16:12:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.198 2011/12/07 05:42:19 vapier Exp $ + + 07 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.4.1, + files/gcc-config-1.5: + Fix multilib support with @GENTOO_LIBDIR@. *gcc-config-1.5-r2 (11 Nov 2011) diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.1 b/sys-devel/gcc-config/files/gcc-config-1.4.1 index 53b71f16f434..4d9d2524e58b 100644 --- a/sys-devel/gcc-config/files/gcc-config-1.4.1 +++ b/sys-devel/gcc-config/files/gcc-config-1.4.1 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.11 2011/03/07 12:48:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.12 2011/12/07 05:42:19 vapier Exp $ trap ":" INT QUIT TSTP @@ -19,7 +19,7 @@ umask 022 SED=$(type -P gsed) SED=${SED:-$(type -P sed)} -GENTOO_LIBDIR="lib" +GENTOO_LIBDIR="@GENTOO_LIBDIR@" [[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib" usage() { @@ -694,9 +694,9 @@ for x in "$@" ; do rcsfile="$RCSfile: gcc-config-1.4.1,v $" rcsfile=${rcsfile#: } rcsfile=${rcsfile%,v*} - cvsrev="$Revision: 1.11 $" + cvsrev="$Revision: 1.12 $" cvsrev=${cvsrev#: } - cvsdate="$Date: 2011/03/07 12:48:15 $" + cvsdate="$Date: 2011/12/07 05:42:19 $" cvsdate=${cvsdate#: } echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})" exit 0 diff --git a/sys-devel/gcc-config/files/gcc-config-1.5 b/sys-devel/gcc-config/files/gcc-config-1.5 index ae9e580e6462..64eb6473aede 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.5 +++ b/sys-devel/gcc-config/files/gcc-config-1.5 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5,v 1.6 2011/11/11 16:12:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5,v 1.7 2011/12/07 05:42:19 vapier Exp $ # Format of /etc/env.d/gcc/: # config-TARGET: CURRENT=version for TARGET @@ -39,7 +39,7 @@ if ! type -P tac >/dev/null ; then tac() { ${SED} -e '1!G;h;$!d' "$@" ; } fi -GENTOO_LIBDIR="lib" +GENTOO_LIBDIR="@GENTOO_LIBDIR@" [[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib" usage() { @@ -633,9 +633,9 @@ for x in "$@" ; do rcsfile="$RCSfile: gcc-config-1.5,v $" rcsfile=${rcsfile#: } rcsfile=${rcsfile%,v*} - cvsrev="$Revision: 1.6 $" + cvsrev="$Revision: 1.7 $" cvsrev=${cvsrev#: } - cvsdate="$Date: 2011/11/11 16:12:49 $" + cvsdate="$Date: 2011/12/07 05:42:19 $" cvsdate=${cvsdate#: } echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})" exit 0 |