diff options
| author |   Benda XU <heroxbd@gentoo.org> | 2011-12-21 04:13:08 +0000 |
|---|---|---|
| committer | Benda XU <heroxbd@gentoo.org> | 2011-12-21 04:13:08 +0000 |
| commit | bb6034952483a23b1942cd217fe55d8d12b9d7e8 (patch) | |
| tree | c9aa1db3f9b4090f25efb57942b860b7798143e7 | |
| parent | version bump (bug #395411) (diff) | |
| download | historical-bb6034952483a23b1942cd217fe55d8d12b9d7e8.tar.gz historical-bb6034952483a23b1942cd217fe55d8d12b9d7e8.tar.bz2 historical-bb6034952483a23b1942cd217fe55d8d12b9d7e8.zip | |
include to prevent this trick apply to cross compilers; fix grep pattern against ldd; recomment the excluded patch names
| -rw-r--r-- | profiles/prefix/linux/profile.bashrc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc index 8378c6feaeaa..79aa79710fa6 100644 --- a/profiles/prefix/linux/profile.bashrc +++ b/profiles/prefix/linux/profile.bashrc @@ -3,14 +3,14 @@ # # # Remember, bash treats floats like strings.. -if [[ ${PN} == gcc && ${EBUILD_PHASE} == unpack ]]; then +if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == unpack ]]; then # Since 2.3 > 2.12 in numerical terms, just compare 2.X to 2.Y, will break # if >=3.0 is ever released - VERS=$(/usr/bin/ldd --version | head -n1 | grep -o "version [0-9]\.[0-9]\+" | cut -d. -f2 ) + VERS=$(/usr/bin/ldd --version | head -n1 | grep -o ") [0-9]\.[0-9]\+" | cut -d. -f2 ) if [[ $VERS -lt 12 ]]; then # compare host glibc 2.x to 2.12 ewarn "Your host glibc is too old; disabling automatic fortify. bug 289757" - EPATCH_EXCLUDE+=" 10_all_gcc-default-fortify-source.patch" # old name - EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" # new name + EPATCH_EXCLUDE+=" 10_all_gcc-default-fortify-source.patch" # <=gcc-4.5* + EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" # >=gcc-4.6* fi fi |