[gentoo-commits] gentoo-x86 commit in profiles/prefix/linux: profile.bashrc

[Benda XU (heroxbd)]

heroxbd     11/12/21 04:13:08

  Modified:             profile.bashrc
  Log:
  include  to prevent this trick apply to cross compilers; fix grep pattern against ldd; recomment the excluded patch names

Revision  Changes    Path
1.3                  profiles/prefix/linux/profile.bashrc

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/prefix/linux/profile.bashrc?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/prefix/linux/profile.bashrc?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/prefix/linux/profile.bashrc?r1=1.2&r2=1.3

Index: profile.bashrc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/prefix/linux/profile.bashrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- profile.bashrc	15 Dec 2011 18:35:49 -0000	1.2
+++ profile.bashrc	21 Dec 2011 04:13:08 -0000	1.3
@@ -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