include to prevent this trick apply to cross compilers; fix grep pattern against...

diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc
index 8378c6feaeaa55d8a4671b069faebcf6f95ec6bc..79aa79710fa635cb02efae590eed7f90c8ce5628 100644 (file)
--- 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