added hardened-gcc hppa behaviour

4 files changed, 41 insertions, 11 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 3957c3f38aa7..1b8e18547d93 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.35 2003/09/23 14:51:03 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.36 2003/10/09 19:36:17 pappy Exp $
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org>
+  module-init-tools-0.9.12-r1.ebuild, module-init-tools-0.9.13_pre2.ebuild:
+  added hardened-gcc hppa behaviour
 
   17 Sep 2003; Jon Portnoy <avenj@gentoo.org>
   module-init-tools-0.9.15_pre1.ebuild :
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index a0f3fd4d7050..0bab203e3879 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,6 +1,6 @@
-MD5 6317f325039c9f279fec5541ab1c6804 module-init-tools-0.9.12-r1.ebuild 5323
-MD5 2499770bd711d9ce96658ea1e0a0baf4 module-init-tools-0.9.13_pre2.ebuild 5232
-MD5 5613739f58c5e7fffd7a6bda21944209 ChangeLog 8828
+MD5 88ba3dcb6d48461dcdf8cf9c093de4ae module-init-tools-0.9.12-r1.ebuild 5322
+MD5 41f91fe5b7dedb0ddaed00e0e2f8a81e module-init-tools-0.9.13_pre2.ebuild 5231
+MD5 d56d66408074ee16d7b0e204642c5043 ChangeLog 8827
 MD5 84fd34c0fab48ffc68a7ab6cad0b1d7f module-init-tools-0.9.15_pre1.ebuild 4344
 MD5 7c7bc0686633525168414a46cc48ac56 module-init-tools-0.9.14.ebuild 4620
 MD5 86e20b45d2b65159d422d225468ef960 files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch 3490
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild
index f2bc9af1ab75..8d0f9862f320 100644
--- a/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.12-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-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild,v 1.7 2003/09/23 14:51:03 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild,v 1.8 2003/10/09 19:36:17 pappy Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -64,8 +64,21 @@ src_compile() {
 
 	filter-flags -fPIC
 
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	has_version 'sys-devel/hardened-gcc' && append-flags '-yet_exec'
+    # 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
 
 	einfo "Building modutils..."
 	cd ${WORKDIR}/modutils-${MODUTILS_PV}
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild
index 28ad189927b7..f9dc14d4dd9f 100644
--- a/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.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-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild,v 1.4 2003/09/23 14:51:03 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild,v 1.5 2003/10/09 19:36:17 pappy Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -62,11 +62,24 @@ src_unpack() {
 src_compile() {
 	local myconf=
 
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	has_version 'sys-devel/hardened-gcc' && append-flags '-yet_exec'
-
 	filter-flags -fPIC
 
+    # 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
+
 	einfo "Building modutils..."
 	cd ${WORKDIR}/modutils-${MODUTILS_PV}