From 8686d18eaa18ad8944ebd6b1f54af4366948fe90 Mon Sep 17 00:00:00 2001
From: Matt Rickard <frogger@gentoo.org>
Date: Mon, 14 Jul 2003 18:07:26 +0000
Subject: Do not apply ProPolice patches if ARCH is HPPA

---
 sys-devel/gcc/ChangeLog           |  7 ++++++-
 sys-devel/gcc/Manifest            |  4 ++--
 sys-devel/gcc/gcc-3.2.3-r1.ebuild | 14 +++++++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'sys-devel')

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 4db58b6b46e9..8b167328b09b 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.108 2003/07/09 16:45:56 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.109 2003/07/14 18:07:09 frogger Exp $
+
+  14 Jul 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.3-r1.ebuild:
+  ProPolice does not work on architectures where the stack
+  grows upward (such as HPPA).  Therefore, if the 
+  architecture is HPPA, do not apply the ProPolice patches.
 
   09 Jul 2003; Matthew Rickard <frogger@gentoo.org> gcc-3.2.3-r1.ebuild:
   Updated ProPolice to protector-8.  This includes minor
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e7c5ff3c7576..76d0d0d37b84 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,6 +1,6 @@
 MD5 63530786ea42df2b5ca6e52999f586f2 gcc-2.95.3-r7.ebuild 5464
 MD5 cc1be3b81467d78adbe37b1aa9f2e139 gcc-3.3.ebuild 16164
-MD5 fc7f7e7283ed58e762ec18f9c3841eca gcc-3.2.3-r1.ebuild 16124
+MD5 5568b4e0eb60ef6580354c68141ef0b1 gcc-3.2.3-r1.ebuild 16125
 MD5 feed532ddfb47b382cd79f924d8578db manifest 7147
 MD5 857d79065f68cdc820201acbeb5c10ac gcc-3.2.1-r7.ebuild 14840
 MD5 feb010a6cb97e65c1d201a5796e92942 gcc-3.0.4-r6.ebuild 8766
@@ -9,7 +9,7 @@ MD5 3d13dcdb8ae4a92e1809b031504feb59 gcc-3.2.2.ebuild 15327
 MD5 b47190af0648ab5deee8d2fdf337bd4e gcc-2.95.3-r8.ebuild 9250
 MD5 8b116192168fec85477e59d68d24ac44 gcc-3.2-r5.ebuild 12936
 MD5 789ae0db671f886a9d355cfcc6c561ec gcc-3.1-r8.ebuild 9814
-MD5 59610eab849f85623a661e80abf227b6 ChangeLog 23830
+MD5 69b1f0f2b601352f68385b650792e030 ChangeLog 23830
 MD5 25e5edcce8f471a375b397ccbd52a761 gcc-3.2.2-r2.ebuild 15119
 MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
 MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
diff --git a/sys-devel/gcc/gcc-3.2.3-r1.ebuild b/sys-devel/gcc/gcc-3.2.3-r1.ebuild
index 12eafade6a51..83a467082682 100644
--- a/sys-devel/gcc/gcc-3.2.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r1.ebuild,v 1.9 2003/07/09 17:00:06 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r1.ebuild,v 1.10 2003/07/14 18:07:09 frogger Exp $
 
 IUSE="static nls bootstrap java build"
 
@@ -184,10 +184,14 @@ src_unpack() {
 	version_patch ${FILESDIR}/3.2.3/gcc323-gentoo-branding.patch
 
 	# ProPolice Stack Smashing protection - protector-3.2.2-8
-	epatch ${WORKDIR}/protector.dif
-	cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
-	cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
-	version_patch ${FILESDIR}/3.2.3/gcc-323-propolice-version.patch 
+	# ProPolice does not work on archs where the stack grows upward (HPPA)
+	if [ ${ARCH} != "hppa" ]
+	then
+		epatch ${WORKDIR}/protector.dif
+		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
+		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
+		version_patch ${FILESDIR}/3.2.3/gcc-323-propolice-version.patch 
+	fi
 
 	# Patches from Mandrake/Suse ...
 	epatch ${FILESDIR}/3.2.1/gcc31-loop-load-final-value.patch
-- 
cgit v1.2.3-65-gdbad