added new hardened-gcc flags for hppa

3 files changed, 34 insertions, 16 deletions

diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 59b70f19771d..212bdf83b462 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,7 +1,7 @@
 MD5 098f4346f266cf8ae5c08ae6eca79c1c svgalib-1.9.17-r2.ebuild 2656
-MD5 24a261e376af08d014e1b38eeeda27a5 ChangeLog 3291
-MD5 ab0dc7b0529c6bb0d6ff4eb0d4204871 svgalib-1.4.3-r4.ebuild 2788
-MD5 d0bad1100eb9ae8638225ba05bf4c8ed svgalib-1.9.17-r3.ebuild 3258
+MD5 7b2e9707d2cb6e27ba88ae4397969dee ChangeLog 3291
+MD5 3bd8eadc27a0194a69371845b504391e svgalib-1.4.3-r4.ebuild 2785
+MD5 3c8fa4d3bbffea8ac26ee9f09e345b66 svgalib-1.9.17-r3.ebuild 3255
 MD5 19b74fedfd6953bd3537a803abecc4d3 files/svgalib-1.4.3-gentoo.diff 10364
 MD5 e4ead3e3192f5a945ff177331122d7ae files/digest-svgalib-1.9.17-r2 66
 MD5 e4ead3e3192f5a945ff177331122d7ae files/digest-svgalib-1.9.17-r3 66
diff --git a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
index 7b82b33a94d2..d4da67d52de0 100644
--- a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.3-r4.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/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.8 2003/09/06 23:59:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.9 2003/10/09 19:33:28 pappy Exp $
 
 inherit eutils
 
@@ -27,12 +27,21 @@ src_unpack() {
 }
 
 src_compile() {
-
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if has_version 'sys-devel/hardened-gcc' && [ "${CC}"="gcc" ]
-	then
-		CFLAGS="${CFLAGS} -yet_exec"
-	fi
+    # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
+    if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc"
+    then
+        append-flags "-yet_exec -fstack-protector"
+    fi
+
+    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        append-flags "-yet_exec"
+    fi
+
+    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        append-flags "-yet_exec"
+    fi
 
 	make OPTIMIZE="${CFLAGS}" static shared textutils lrmi utils || die
 	# Build the gl stuff tpp
diff --git a/media-libs/svgalib/svgalib-1.9.17-r3.ebuild b/media-libs/svgalib/svgalib-1.9.17-r3.ebuild
index 8301e989bf9d..c0ceffa7918c 100644
--- a/media-libs/svgalib/svgalib-1.9.17-r3.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.17-r3.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/media-libs/svgalib/svgalib-1.9.17-r3.ebuild,v 1.5 2003/09/06 23:59:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.17-r3.ebuild,v 1.6 2003/10/09 19:33:28 pappy Exp $
 
 inherit eutils
 
@@ -32,12 +32,21 @@ src_unpack() {
 }
 
 src_compile() {
-
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if has_version 'sys-devel/hardened-gcc' && [ "${CC}"="gcc" ]
-	then
+    # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
+    if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc"
+    then
+        CC="${CC} -yet_exec -fstack-protector"
+    fi
+
+    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        CC="${CC} -yet_exec"
+    fi
+
+    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
+    then
 		CC="${CC} -yet_exec"
-	fi
+    fi
 
 	make OPTIMIZE="${CFLAGS}" static shared textutils lrmi utils || \
 		die "Failed to build libraries and utils!"