diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-05-15 00:47:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-05-15 00:47:17 +0000 |
| commit | e1dbcbd1f5b58efb9546897bf516c2f737c2373d (patch) | |
| tree | 49e9282978da4d4f74754ea5ad7b0b248ce126ef | |
| parent | Version bump and cleanup. (diff) | |
| download | historical-e1dbcbd1f5b58efb9546897bf516c2f737c2373d.tar.gz historical-e1dbcbd1f5b58efb9546897bf516c2f737c2373d.tar.bz2 historical-e1dbcbd1f5b58efb9546897bf516c2f737c2373d.zip | |
fix up some errors in the PATH/ROOTPATH -> GCC_PATH conversion
Package-Manager: portage-2.1.2.7
| -rw-r--r-- | sys-devel/gcc-config/Manifest | 18 | ||||
| -rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.4.0 | 14 |
2 files changed, 25 insertions, 7 deletions
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest index af2bd45a58ee..58ffc15281ea 100644 --- a/sys-devel/gcc-config/Manifest +++ b/sys-devel/gcc-config/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX gcc-config-1.3.13 18593 RMD160 6c9040b76a2a39b901a9b31c6fe9e8113cfd60b9 SHA1 d1e652d925600d58c8703a4e1d7c32447ed038ce SHA256 7cd8c4faeedad2ffdddc0f1ebec9a38217b4c090c013e5a045e78aa47ee061dd MD5 67217235dcd86563f7a1a0a7f51f5349 files/gcc-config-1.3.13 18593 RMD160 6c9040b76a2a39b901a9b31c6fe9e8113cfd60b9 files/gcc-config-1.3.13 18593 @@ -14,10 +17,10 @@ AUX gcc-config-1.3.16 19744 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae SHA1 MD5 5fc3469999611894758a1b9c2365b719 files/gcc-config-1.3.16 19744 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae files/gcc-config-1.3.16 19744 SHA256 c4c3ada7597b7a8610873ff2b45b0137264821df870a1700fd278727c72e3717 files/gcc-config-1.3.16 19744 -AUX gcc-config-1.4.0 19359 RMD160 8c4bb1733e63886818d2f734a86a2e80f010da93 SHA1 81961d10ff9dd408712883685488e7dd12162bf5 SHA256 f320c4679efd82c54b6126933b9fc19fd0c4780207a705db7c2ea3d6b707df94 -MD5 f989c101b6538ea45113b81fcbf61653 files/gcc-config-1.4.0 19359 -RMD160 8c4bb1733e63886818d2f734a86a2e80f010da93 files/gcc-config-1.4.0 19359 -SHA256 f320c4679efd82c54b6126933b9fc19fd0c4780207a705db7c2ea3d6b707df94 files/gcc-config-1.4.0 19359 +AUX gcc-config-1.4.0 19618 RMD160 336d69c1a25803546898500134fb29ce529c21e0 SHA1 0f86745e3c4055bf02cbf0c11bcfd2952c15ea40 SHA256 de282569cfa05ec2ab2bd9d0a6890f1aceb4ca8904106d789e9e555858232ac6 +MD5 b9bc759abce2fac7861a358a8cbd4e85 files/gcc-config-1.4.0 19618 +RMD160 336d69c1a25803546898500134fb29ce529c21e0 files/gcc-config-1.4.0 19618 +SHA256 de282569cfa05ec2ab2bd9d0a6890f1aceb4ca8904106d789e9e555858232ac6 files/gcc-config-1.4.0 19618 AUX wrapper-1.4.7.c 9837 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 SHA1 4aee9df408a84b22b4007bc9b74543dd8a6f4fc8 SHA256 f462c49721d291ce3b91c46e5fb8e567d6344f0e359e788301bac07065987744 MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 files/wrapper-1.4.7.c 9837 @@ -81,3 +84,10 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-gcc-config-2.0.0_rc1 277 RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-gcc-config-2.0.0_rc1 277 SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-gcc-config-2.0.0_rc1 277 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGSQNa8bi6rjpTunYRAsVwAKDEkOUUqR+B8Oomm1GkjyPpOc9iLACg12oO +cUVQZMh82mt72VwxfRNk+mM= +=z0QD +-----END PGP SIGNATURE----- diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.0 b/sys-devel/gcc-config/files/gcc-config-1.4.0 index 71357ae8b88d..c55c7a9ab0b4 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.4.0 +++ b/sys-devel/gcc-config/files/gcc-config-1.4.0 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2007 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.0,v 1.15 2007/05/03 05:20:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.16 2007/05/15 00:47:17 vapier Exp $ trap ":" INT QUIT TSTP @@ -192,10 +192,17 @@ switch_profile() { # Translate old PATH/ROOTPATH to GCC_PATH cp -p "${GCC_ENV_D}/${CC_COMP}" "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" || return 1 + GCC_PATH=$( + unset GCC_PATH PATH ROOTPATH + source "${GCC_ENV_D}/${CC_COMP}" + echo ${GCC_PATH:-${PATH:-${ROOTPATH}}} + ) sed -i \ - -e 's:^PATH=:GCC_PATH=:' \ + -e '/^PATH=/d' \ -e '/^ROOTPATH=/d' \ + -e '/^GCC_PATH=/d' \ "${GCC_ENV_D}/${CC_COMP}" || return 1 + echo "GCC_PATH=\"${GCC_PATH}\"" >> "${GCC_ENV_D}/${CC_COMP}" || return 1 touch -r "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" "${GCC_ENV_D}/${CC_COMP}" || return 1 rm -f "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" || return 1 @@ -207,7 +214,8 @@ switch_profile() { # What kind of env.d entry are we going to generate ? if is_cross_compiler ; then - grep '^GCC_PATH=' "${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc-${CTARGET}" + echo "PATH=\"${GCC_PATH}\"" > "${ENV_D}/05gcc-${CTARGET}" + echo "ROOTPATH=\"${GCC_PATH}\"" >> "${ENV_D}/05gcc-${CTARGET}" echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}" else # Pass all by default |