summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-05-23 08:09:31 +0000
committerTravis Tilley <lv@gentoo.org>2004-05-23 08:09:31 +0000
commita5e12c3275d0e8ac31a93481355b3b21a507698a (patch)
tree9f86eb906fc272b6a9e0e86c324a1e94eb16da74 /sys-devel
parentmake patchset apply all patches on all archs and re-added hppa keyword since ... (diff)
downloadgentoo-2-a5e12c3275d0e8ac31a93481355b3b21a507698a.tar.gz
gentoo-2-a5e12c3275d0e8ac31a93481355b3b21a507698a.tar.bz2
gentoo-2-a5e12c3275d0e8ac31a93481355b3b21a507698a.zip
make libiberty pic patch apply if use pie OR use hardened
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gcc/gcc-3.4.0-r4.ebuild4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys-devel/gcc/gcc-3.4.0-r4.ebuild b/sys-devel/gcc/gcc-3.4.0-r4.ebuild
index 6ddfb22d5280..895ffa2ed200 100644
--- a/sys-devel/gcc/gcc-3.4.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.4.0-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r4.ebuild,v 1.3 2004/05/21 12:19:02 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r4.ebuild,v 1.4 2004/05/23 08:09:31 lv Exp $
IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc"
@@ -403,7 +403,7 @@ src_unpack() {
fi
# corrects text relocations in libiberty.a
- use pic && epatch ${FILESDIR}/3.4.0/gcc-3.4-libiberty-pic.patch
+ (use pic || use hardened) && epatch ${FILESDIR}/3.4.0/gcc-3.4-libiberty-pic.patch
version_patch ${FILESDIR}/3.4.0/gcc-${PV}-r3-gentoo-branding.patch \
"${BRANCH_UPDATE} (${release_version})" || die "Failed Branding"