summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2011-12-15 18:35:49 +0000
committerJeremy Olexa <darkside@gentoo.org>2011-12-15 18:35:49 +0000
commit939f392bbc0081bd769a5e9fa0a28dfc71c285ae (patch)
tree4c6381ee8d5420ee7b9c4764f7d133058d7038be /profiles
parentStable for AMD64, wrt bug #393863 (diff)
downloadgentoo-2-939f392bbc0081bd769a5e9fa0a28dfc71c285ae.tar.gz
gentoo-2-939f392bbc0081bd769a5e9fa0a28dfc71c285ae.tar.bz2
gentoo-2-939f392bbc0081bd769a5e9fa0a28dfc71c285ae.zip
Fix bug 289757 (again). Use ldd, use EPATCH_EXCLUDE, match new patch name as well
Diffstat (limited to 'profiles')
-rw-r--r--profiles/prefix/ChangeLog6
-rw-r--r--profiles/prefix/linux/profile.bashrc5
2 files changed, 8 insertions, 3 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index b7b3e97e7438..7db321225070 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for profiles/prefix
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.307 2011/12/08 08:13:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.308 2011/12/15 18:35:49 darkside Exp $
+
+ 15 Dec 2011; Jeremy Olexa <darkside@gentoo.org> linux/profile.bashrc:
+ Fix bug 289757 (again). Use ldd, use EPATCH_EXCLUDE, match new patch name as
+ well
08 Dec 2011; Fabian Groffen <grobian@gentoo.org> package.use.mask:
Mask USE=vanilla for gcc, since that results in a broken compiler on Prefix
diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc
index 89190996944a..8378c6feaeaa 100644
--- a/profiles/prefix/linux/profile.bashrc
+++ b/profiles/prefix/linux/profile.bashrc
@@ -6,10 +6,11 @@
if [[ ${PN} == 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=$(/lib/libc.so.6 | head -n1 | grep -o "version [0-9]\.[0-9]" | cut -d. -f2 )
+ VERS=$(/usr/bin/ldd --version | head -n1 | grep -o "version [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"
- GENTOO_PATCH_EXCLUDE="10_all_gcc-default-fortify-source.patch"
+ EPATCH_EXCLUDE+=" 10_all_gcc-default-fortify-source.patch" # old name
+ EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" # new name
fi
fi