Added a patch to stop DEBUG forcing -O if no COPTFLAGS defined to fix a kernel

  panic on boot with sparc64.
Package-Manager: portage-2.1.2.7

4 files changed, 48 insertions, 20 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 6dad92c01e2c..1b6eccf1f033 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.35 2007/01/15 21:40:03 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.36 2007/05/09 09:29:08 uberlord Exp $
+
+  09 May 2007; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-sources-6.2-debug-O2.patch, freebsd-sources-6.2.ebuild:
+  Added a patch to stop DEBUG forcing -O if no COPTFLAGS defined to fix a kernel
+  panic on boot with sparc64.
 
 *freebsd-sources-6.2 (15 Jan 2007)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 5f976b7e5fc5..d3353166291b 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX freebsd-sources-6.0-asm.patch 4172 RMD160 7872cbedbbe9fbead0d69f26674489b335317606 SHA1 350d5453ec523a6835ff7ad36bcff7f3bc7dce3f SHA256 2431b2dae991eef15c00c3e19ac01e23e374a1e8e6992053e64486032631b52e
 MD5 d7ba170be5603b2bc377cbd544c82a23 files/freebsd-sources-6.0-asm.patch 4172
 RMD160 7872cbedbbe9fbead0d69f26674489b335317606 files/freebsd-sources-6.0-asm.patch 4172
@@ -17,6 +14,10 @@ AUX freebsd-sources-6.1-ntfs.patch 1043 RMD160 0389ef971934db5b239d81ec016d94a21
 MD5 ea9ee941c9105bed2e9d226450087ee1 files/freebsd-sources-6.1-ntfs.patch 1043
 RMD160 0389ef971934db5b239d81ec016d94a21398c226 files/freebsd-sources-6.1-ntfs.patch 1043
 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 files/freebsd-sources-6.1-ntfs.patch 1043
+AUX freebsd-sources-6.2-debug-O2.patch 815 RMD160 ae2c83117b81b47589e7ee35096c94cc8eceb29b SHA1 8f20681d81b171d93005d72acfbdf19481f5100c SHA256 92a5070fbb6e951417bf83065c9f8ba11d3f5f2b17bc340f1c3080d54af52177
+MD5 f2c9bb12b453528f9337ac5cfa8918ea files/freebsd-sources-6.2-debug-O2.patch 815
+RMD160 ae2c83117b81b47589e7ee35096c94cc8eceb29b files/freebsd-sources-6.2-debug-O2.patch 815
+SHA256 92a5070fbb6e951417bf83065c9f8ba11d3f5f2b17bc340f1c3080d54af52177 files/freebsd-sources-6.2-debug-O2.patch 815
 AUX freebsd-sources-6.2-gcc41.patch 16887 RMD160 8ca5a1a76db802ca3e833ad15796bdf337002cb1 SHA1 5d4cec24352e20200028a98700008e8388999b3e SHA256 b28f57d0c73cf31bcac6c8424b0bc9fb24b5652f11a3e85d8a4a40b376976fab
 MD5 0cf6f8a9595b6beefafbdb0fa3e745c2 files/freebsd-sources-6.2-gcc41.patch 16887
 RMD160 8ca5a1a76db802ca3e833ad15796bdf337002cb1 files/freebsd-sources-6.2-gcc41.patch 16887
@@ -30,14 +31,14 @@ MD5 91662a80d0cd0cd3dca34f3c1ca54830 files/freebsd-sources-gentoo.patch 1191
 RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 files/freebsd-sources-gentoo.patch 1191
 SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7 files/freebsd-sources-gentoo.patch 1191
 DIST freebsd-sys-6.2.tar.bz2 18344936 RMD160 784230e22ccaf09933ef3f053ff29cc3e579786a SHA1 161b7a4d165665deb1c4434c356b5f610a72a83a SHA256 a754371d88601aaab7152bb3d127bd3777db912e13a26a866e13ba34934c5e5b
-EBUILD freebsd-sources-6.2.ebuild 2697 RMD160 fd1ab29b6f4f68c3fc08e2bd9ec63264ca8da36f SHA1 cfe6ad3d7e55ae4f296b520e94a7537ce245a4ec SHA256 462b1009573c99f38ef82c433713ec63e582919432a2c219ddc4bfe65b7ddf93
-MD5 43fd6f36fc47aa8ae1f1a45c38741c75 freebsd-sources-6.2.ebuild 2697
-RMD160 fd1ab29b6f4f68c3fc08e2bd9ec63264ca8da36f freebsd-sources-6.2.ebuild 2697
-SHA256 462b1009573c99f38ef82c433713ec63e582919432a2c219ddc4bfe65b7ddf93 freebsd-sources-6.2.ebuild 2697
-MISC ChangeLog 10094 RMD160 57b7f70bee9e42b884563b3678c7e8f1b1b3944a SHA1 6467baafb2e35d2d0c4da5c2e0885419f31239bf SHA256 cf3c03f8ede30823cf0f3d6e619ab056c61d58c12b513aa127a1eaa101d1ff18
-MD5 8538300ea761042261f46cc3f4a52b91 ChangeLog 10094
-RMD160 57b7f70bee9e42b884563b3678c7e8f1b1b3944a ChangeLog 10094
-SHA256 cf3c03f8ede30823cf0f3d6e619ab056c61d58c12b513aa127a1eaa101d1ff18 ChangeLog 10094
+EBUILD freebsd-sources-6.2.ebuild 2746 RMD160 0ca4ceb5773bc3e2cb01fe7679aee482c194b5dc SHA1 23609b30548648578b9d3d06de8bb6dffc032a72 SHA256 8edd769332a9532e3573725d9f721966c6653c4f213b6a0379df1383445a55bc
+MD5 ebc9c9463e0c1581c0959f2482f9673a freebsd-sources-6.2.ebuild 2746
+RMD160 0ca4ceb5773bc3e2cb01fe7679aee482c194b5dc freebsd-sources-6.2.ebuild 2746
+SHA256 8edd769332a9532e3573725d9f721966c6653c4f213b6a0379df1383445a55bc freebsd-sources-6.2.ebuild 2746
+MISC ChangeLog 10330 RMD160 641b934eb6f319784e7c5840ca715521a8a11587 SHA1 c0718d8c2785168953976ecc01e94c3c3a04a223 SHA256 0ef93ecdbb487a4c496396f03fdfa8b087b1b73b61ca2e9bc397770e0a27de60
+MD5 b618dd0afe919db5d83674e046fdc940 ChangeLog 10330
+RMD160 641b934eb6f319784e7c5840ca715521a8a11587 ChangeLog 10330
+SHA256 0ef93ecdbb487a4c496396f03fdfa8b087b1b73b61ca2e9bc397770e0a27de60 ChangeLog 10330
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -45,10 +46,3 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 44a5c3d9ab8211e3d27c2a0bd4b23e5d files/digest-freebsd-sources-6.2 256
 RMD160 b7c0e2d559e11b94402d2a752c3cbda7f782824b files/digest-freebsd-sources-6.2 256
 SHA256 69e6dc9f0eb26473d50a9e4ecece2a92c4177e8491dc8d5722772e3e23f9c922 files/digest-freebsd-sources-6.2 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFq/S6GDyatLGpTbYRAk/NAJ48sHrrLNqJiiiRQbN5JcUZzZt4TQCfbB0W
-ShcVhbgDDlyDJ/A43ywBnvU=
-=4I6U
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-debug-O2.patch
new file mode 100644
index 000000000000..88a476b92233
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-debug-O2.patch
@@ -0,0 +1,28 @@
+My UltraSPARC U5 panics on boot about a memory alignment error when compiled
+with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly
+affect debugging.
+
+NOTE: This does not fix the memory alignment panic when loading kernel modules.
+
+Roy Marples (uberlord@gentoo.org)
+
+diff -ur a/conf/kern.pre.mk b/conf/kern.pre.mk
+--- a/conf/kern.pre.mk	2007-05-06 21:36:18 +0100
++++ b/conf/kern.pre.mk	2007-05-09 09:58:37 +0100
+@@ -19,15 +19,10 @@
+ .if ${CC} == "icc"
+ COPTFLAGS?=	-O
+ .else
+-. if defined(DEBUG)
+-_MINUS_O=	-O
+-. else
+-_MINUS_O=	-O2
+-. endif
+ . if ${MACHINE_ARCH} == "amd64"
+ COPTFLAGS?=-O2 -frename-registers -pipe
+ . else
+-COPTFLAGS?=${_MINUS_O} -pipe
++COPTFLAGS?=-O2 -pipe
+ . endif
+ . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
+ COPTFLAGS+= -fno-strict-aliasing
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.2.ebuild
index e6401b47db76..96628b9fc78f 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.2.ebuild,v 1.1 2007/01/15 21:40:03 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.2.ebuild,v 1.2 2007/05/09 09:29:08 uberlord Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -40,6 +40,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-6.2-gcc41.patch"
 	epatch "${FILESDIR}/${PN}-6.2-sparc64.patch"
 	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+	epatch "${FILESDIR}/${PN}-6.2-debug-O2.patch"
 
 	# Disable SSP for the kernel
 	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \