From 6ab569ce2a2feaaaa10cdf4295d5bbea191c90f6 Mon Sep 17 00:00:00 2001
From: Alexander Gabert <pappy@gentoo.org>
Date: Thu, 9 Oct 2003 19:41:22 +0000
Subject: added new hardened-gcc flags for hppa

---
 sys-libs/libcap/Manifest           |  4 ++--
 sys-libs/libcap/libcap-1.10.ebuild | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'sys-libs/libcap')

diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index d9d03a82bad8..693039c62d3a 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,7 +1,7 @@
 MD5 8af7d585afc6f4423a4edcad47bf5aec libcap-1.10-r3.ebuild 1782
-MD5 87998451d82b833ddcc20932599f7938 libcap-1.10.ebuild 2128
+MD5 131008efce7d6e1c79760eca7ab18483 libcap-1.10.ebuild 2128
 MD5 510725e722e6c593968f928c994b0d9d libcap-1.10-r2.ebuild 1610
-MD5 953181190914a063ad66ddf3a90aa92e ChangeLog 1830
+MD5 84d0c5cf319ba85c9b9052130aca59f7 ChangeLog 1830
 MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
 MD5 8f279ebf325d1b8efb6ad3c3a0d8cb5d files/libcap-1.10-python.patch 3353
 MD5 f55c8f8c068940da50e21f4d4b840422 files/digest-libcap-1.10-r2 63
diff --git a/sys-libs/libcap/libcap-1.10.ebuild b/sys-libs/libcap/libcap-1.10.ebuild
index 1cfa602cc18c..1cfadbfd8e0f 100644
--- a/sys-libs/libcap/libcap-1.10.ebuild
+++ b/sys-libs/libcap/libcap-1.10.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-libs/libcap/libcap-1.10.ebuild,v 1.9 2003/10/01 11:05:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10.ebuild,v 1.10 2003/10/09 19:41:15 pappy Exp $
 
 inherit base flag-o-matic
 
@@ -36,8 +36,21 @@ src_compile() {
 		CFLAGS="${CFLAGS} -I/usr/include/python${PYTHONVER}"
 	fi
 
-	has_version 'sys-devel/hardened-gcc' && \
-	append-flags "-yet_exec -fstack-protector -Wl,$(gcc-config -L)/libgcc.a -Wl,/lib/libc.so.6"
+    # 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
 
 	emake COPTFLAG="${CFLAGS}" DEBUG="" ${myflags} || die
 }
-- 
cgit v1.2.3-65-gdbad