diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-12-05 21:17:31 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-12-05 21:17:31 +0000 |
| commit | 48069587e0c781ce02d622883f9ab64cff6c89ae (patch) | |
| tree | 6b68e1fa98cca6699e80535efa5be0e18ebb7171 /profiles/prefix | |
| parent | Version bump. (diff) | |
| download | gentoo-2-48069587e0c781ce02d622883f9ab64cff6c89ae.tar.gz gentoo-2-48069587e0c781ce02d622883f9ab64cff6c89ae.tar.bz2 gentoo-2-48069587e0c781ce02d622883f9ab64cff6c89ae.zip | |
Disable the automatic fortify patch for some older linux hosts, bug 289757
Diffstat (limited to 'profiles/prefix')
| -rw-r--r-- | profiles/prefix/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/prefix/linux/profile.bashrc | 16 |
2 files changed, 20 insertions, 1 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog index 03deb5f826b1..a3d452f4ee77 100644 --- a/profiles/prefix/ChangeLog +++ b/profiles/prefix/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for profiles/prefix # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.304 2011/12/01 22:50:18 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.305 2011/12/05 21:17:31 darkside Exp $ + + 05 Dec 2011; Jeremy Olexa <darkside@gentoo.org> +linux/profile.bashrc: + Disable the automatic fortify patch for some older linux hosts, bug 289757 01 Dec 2011; Jeremy Olexa <darkside@gentoo.org> darwin/package.mask, linux/package.use.mask, sunos/solaris/package.mask: diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc new file mode 100644 index 000000000000..89190996944a --- /dev/null +++ b/profiles/prefix/linux/profile.bashrc @@ -0,0 +1,16 @@ +# This is a ugly issue, see bug 289757 for origins +# This mimics the check in gcc ebuilds, bug 362315 +# +# # Remember, bash treats floats like strings.. + +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 ) + 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" + fi +fi + +# vim: set syn=sh expandtab ts=4: |