use debian GNU/kFreeBSD patch instead of a sed that lets the modules be built with -O2 for fixing panics on amd64 with gcc 4.4 and later

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 46 insertions, 12 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 3d9afe881437..90a496415671 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.68 2012/05/04 17:38:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.69 2012/05/04 18:12:40 aballier Exp $
+
+  04 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-sources-9.0.ebuild,
+  +files/freebsd-sources-9.0-disable-optimizations.patch:
+  use debian GNU/kFreeBSD patch instead of a sed that lets the modules be built
+  with -O2 for fixing panics on amd64 with gcc 4.4 and later
 
   04 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-sources-9.0.ebuild:
   build with -O1 on amd64-fbsd otherwise the kernel does not boot with gcc 4.4
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 17b6102ba2c6..dc1d460ab093 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -26,6 +26,7 @@ AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 RMD160 51be284cf04c41d0ff
 AUX freebsd-sources-8.0-werror.patch 718 RMD160 a216ab16df0e4ce896cfe1cfa7ccc4a4376151e7 SHA1 449b058d0b2672436973575e326b3f7c5a90820d SHA256 a8675081639004d576be3c9f2cdb11d586290dc65db4fc9b0ec4da5fe57392bd
 AUX freebsd-sources-8.0-zfs.patch 926 RMD160 be94ae9270060e3892071695e0abcf95d420a59f SHA1 bb2c34cbd9fa6f510e1b19c213f720b213373244 SHA256 d9cf38d074ac26b04f8a36abc4c2a6c8fca52bc16d1cbcd1f87c8c233a0a64f5
 AUX freebsd-sources-8.2-unix2.patch 1642 RMD160 0ddbf08159fe3d99fde9d07ac624a07a53cad81b SHA1 a86aade71970678609d1966dc229ec519c71e3e6 SHA256 6dd35d13a13f5e9333557a84b56c89fc4988d55bc3267cca72e8ca8ca169ce61
+AUX freebsd-sources-9.0-disable-optimizations.patch 792 RMD160 4cd19f9cb5c119eabb3700da25d1f25fd1fc2750 SHA1 3a799bec3310d928cb11c45873faec002d88a732 SHA256 4d04d158c118ec218eae51db8e522efa16467b554df8d1e8f1a882617d36a555
 AUX freebsd-sources-9.0-gentoo.patch 1194 RMD160 1933e7ca85b65d8f81622c01d1b3374fa9072319 SHA1 30992a38173c1732ec1f05fe6c19ac961717917c SHA256 251178d014e62fbc3f20c26dd0e78401cc6691a848facd3ff2c7418ed7a43f22
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
@@ -34,13 +35,13 @@ DIST freebsd-sys-9.0.tar.bz2 30369960 RMD160 137ac728d78767eae184ac0bf00014d1bfe
 EBUILD freebsd-sources-7.2-r3.ebuild 3943 RMD160 3ac41528e8eb22a186114f2b767b33a6f25372ba SHA1 0b0df74007a6cf813292a1a056e4433676e4d2c7 SHA256 f6b279fd482a0b156924fc23fbb7a110b156d7c61a583e25817c1afa3f48b3a8
 EBUILD freebsd-sources-8.0.ebuild 3671 RMD160 6655f21db26ee64b50ce019816667bfe18ee4017 SHA1 00c9a13a48c92554ae49adebd725fde59a3da704 SHA256 4b9c2b8f9a800697543e942138914a7784f3e111dc33db7dfe8daa31c37b3262
 EBUILD freebsd-sources-8.2-r1.ebuild 3701 RMD160 8a12d0abc7d37a19b7cc0447ff2b3bcebdb84a75 SHA1 69d144943d701f2a852324ddbbea1c0705c9fbc0 SHA256 6a5414a83ca2a406b92ba1a3f96467d311469a86c40fdfbf41a8810526e21d43
-EBUILD freebsd-sources-9.0.ebuild 3331 RMD160 88b866037cce652afcb4ce265fc680a40b8ca2bd SHA1 430f565224e8044969041a103579bfc1005a3675 SHA256 072df896e2e5b1c17476aeb48b6ce70df61b0c07a59bb134b76539b730abef91
-MISC ChangeLog 18213 RMD160 90b3e373bf3e1fe0f1f50c9f9b1fe1a282cf469a SHA1 8bc06fbbfdde41c4d67370c39936a76f7cc247b0 SHA256 5a4f2d16e38751d9546790387b7809a15fefcdf256d9ed27896a7ebae350da14
+EBUILD freebsd-sources-9.0.ebuild 3322 RMD160 e5efb0abd0ab553a88ef60fddfed4a31c62173c6 SHA1 9963952e4f7c28f7d3ee1256552903ccd7f2479e SHA256 5a07f9680abe4f39dee7cf3d307e6f45006da275e426cdab29997ba6659062fd
+MISC ChangeLog 18493 RMD160 4fa863aca0962f509cc682dfa4830726c98cdddd SHA1 26fc08b889a1249be1dbd5266b1037d3dc2a05ea SHA256 714af70d9c9e3aaf8117956b24e218c9bdeebe6e2fd538d028696af40c9dc1c2
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+kFBcACgkQvFcC4BYPU0rTdgCdEDAadrsn7dLpV4jIbCOwEJkZ
-3/kAoMhD0O2DVJXa8PP0NnavaQNyU7O7
-=U6hO
+iEYEARECAAYFAk+kHB4ACgkQvFcC4BYPU0qbpgCdHkmcr8SKntij118QkD7IFzOM
+A7YAnjqVszxmtD4qhcQT11j+VNzUIQ2j
+=Yig0
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimizations.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimizations.patch
new file mode 100644
index 000000000000..6160a7b64dc0
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimizations.patch
@@ -0,0 +1,30 @@
+Taken from debian GNU/kFreeBSD.
+
+Regretably, with GCC 4.4 or later this is the only flag combination
+I could find that doesn't cause kernel panics CPU triple-faults or
+other kind of severe breakage.
+
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -41,6 +41,9 @@
+ .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
+ COPTFLAGS+= -fno-strict-aliasing
+ .endif
++.if !empty(COPTFLAGS:M-O[23s])
++COPTFLAGS+= -O1
++.endif
+ .if !defined(NO_CPU_COPTFLAGS)
+ COPTFLAGS+= ${_CPUCFLAGS}
+ .endif
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -91,6 +91,9 @@
+ .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
+ CFLAGS+=	-fno-strict-aliasing
+ .endif
++.if !empty(CFLAGS:M-O[23s])
++CFLAGS+=	-O1
++.endif
+ WERROR?=	-Werror
+ CFLAGS+=	${WERROR}
+ CFLAGS+=	-D_KERNEL
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.0.ebuild
index 23eeb4b7254c..71e8c1f03901 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.0.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0.ebuild,v 1.5 2012/05/04 17:38:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0.ebuild,v 1.6 2012/05/04 18:12:40 aballier Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -33,6 +33,9 @@ src_unpack() {
 		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
 		"${S}/conf/newvers.sh"
 
+	# workaround a kernel panic for amd64-fbsd, bug #408019
+	use amd64-fbsd && epatch "${FILESDIR}/${PN}-9.0-disable-optimizations.patch"
+
 	# __FreeBSD_cc_version comes from FreeBSD's gcc.
 	# on 9.0-RELEASE it's 900001.
 	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
@@ -56,11 +59,6 @@ src_unpack() {
 	# vop_whiteout to tmpfs, so it can be used as an overlay
 	# unionfs filesystem over the cd9660 readonly filesystem.
 	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	# workaround a kernel panic for amd64-fbsd, bug #408019
-	if use amd64-fbsd ; then
-		sed -e "s:-O2:-O1:g" -i "${S}/conf/kern.pre.mk" || die
-	fi
 }
 
 src_compile() {