changed CC -yet_exec for hardened-gcc again to be honoured by the ebuild

3 files changed, 14 insertions, 7 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 187c26287700..af8df242f846 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.238 2003/11/09 21:36:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.239 2003/11/09 21:46:21 pappy Exp $
+
+  09 Nov 2003; Alexander Gabert <pappy@gentoo.org> xfree-4.3.0-r3.ebuild:
+  changed CC -yet_exec for hardened-gcc again to be honoured by the ebuild
 
   09 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild:
   Reverting matrox change, causes compilation problems for some people.
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index d1d321e8a72b..1a8d3d0353e9 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -3,9 +3,9 @@ MD5 049549e84c67068017dcb7a4028fdec1 xfree-4.3.0-r2.ebuild 31516
 MD5 095515724692343cdef7b917bee9c10f xfree-4.3.99.14.ebuild 32062
 MD5 db524c4605805eef089fd8ddda1cb456 xfree-4.3.99.13.ebuild 32129
 MD5 e169e0fe0574ecb23f62d4787abe3dcb xfree-4.2.1-r2.ebuild 24144
-MD5 56163d66f77e920401a41b39b6ff9e6a xfree-4.3.0-r3.ebuild 34769
+MD5 1b02c6d96131810f7171d6864b0c6526 xfree-4.3.0-r3.ebuild 34765
 MD5 841ad6ce6bc0dd92186fa29e6b813c34 xfree-4.3.99.15.ebuild 32675
-MD5 a7e02bc6f37c0c4582a470ed193dc26d ChangeLog 53044
+MD5 b7944bf7d08f7d9a45c72153603f8e3d ChangeLog 53040
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
 MD5 2e730b1127a59eabfc864b23049418d6 xfree-4.2.0-r12.ebuild 10299
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index 2cc037bf79f3..3fc9f716abff 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-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/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.84 2003/11/09 21:36:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.85 2003/11/09 21:46:21 pappy Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -336,6 +336,10 @@ src_unpack() {
 		echo "#define HasLinuxInput YES" >> config/cf/host.def
 	fi
 
+	# this is needed for ./configure and runtime linking and building not to fall into falsely believing
+	# that there are some headers and functions for builtin video drivers or font libraries present
+	has_version "sys-devel/hardened-gcc" && export CC="${CC} -yet_exec"
+
 	echo "#define CcCmd ${CC}" >> config/cf/host.def
 	echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def
 	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def
@@ -347,9 +351,9 @@ src_unpack() {
 
 	if has_version ">=sys-devel/hardened-gcc-1.2"; then
 		einfo "setting DoLoadableServer to NO for PaX and compiler for etdyn building"
-		# this is needed for ./configure and runtime linking and building not to fall into falsely believing
-		# that there are some headers and functions for builtin video drivers or font libraries present
-		export CC="${CC} -yet_exec"
+		# this is good for a pax kernel to load the xfree server without the specific module support
+		# that normally prevents xfree from being memory protected, pappy
+		# it only breaks some people using external nvidia core modules and such, but this is not avoidable
 		sleep 10s
 		echo "#define DoLoadableServer  NO" >>config/cf/host.def
 	fi