Imported changes from linux26-headers, fixes Bug #61884

4 files changed, 48 insertions, 27 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index d4ba148c73d6..fb356e6ce400 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/mips-headers
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.20 2004/06/24 22:58:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.21 2004/08/30 22:59:20 kumba Exp $
+
+*mips-headers-2.6.6-r1 (30 Aug 2004)
+
+  30 Aug 2004; Joshua Kinard <kumba@gentoo.org> +mips-headers-2.6.6-r1.ebuild,
+  -mips-headers-2.6.6.ebuild:
+  Imported changes from linux26-headers, fixes Bug #61884
 
   07 Jun 2004; Joshua Kinard <kumba@gentoo.org>
   +files/mips-headers-2.6.6-spaces_h-kernel.patch, mips-headers-2.6.6.ebuild:
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index 90d73bcd4358..150e295a06af 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,24 +1,24 @@
-MD5 a01d6ad764679bbe9ed3473097d122ae mips-headers-2.4.21-r3.ebuild 1443
-MD5 cbe74c305e6226ff772c4d92cba7046a mips-headers-2.4.25.ebuild 1717
-MD5 13616789f2e0b3e274b72a6a37eb1fa0 mips-headers-2.6.6.ebuild 3130
+MD5 e43147d70e7cc17e75e0ea2d0185533b ChangeLog 4885
+MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
+MD5 bf75617f93eb72af2eadd739b7081093 mips-headers-2.4.21-r1.ebuild 1358
 MD5 10102cf5e4f84e50e4ee08f691607937 mips-headers-2.4.21-r2.ebuild 1260
+MD5 a01d6ad764679bbe9ed3473097d122ae mips-headers-2.4.21-r3.ebuild 1443
 MD5 9cab0c6fa541f55bca68b82dc516b1c1 mips-headers-2.4.22-r1.ebuild 1915
-MD5 bf75617f93eb72af2eadd739b7081093 mips-headers-2.4.21-r1.ebuild 1358
-MD5 53451f27e27494652bed68697d97cd4f ChangeLog 4679
-MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
 MD5 155e3f184046841bd9d49c9986ec52c1 mips-headers-2.4.23.ebuild 1717
-MD5 b7b1f3cc3d41e54d5a23057bc0c83fb5 files/digest-mips-headers-2.4.23 144
-MD5 8562fc546fe46ec1c6a192ad3d61532d files/digest-mips-headers-2.4.25 143
-MD5 47f57c5b40dfb04d3bdbc16989a2d151 files/digest-mips-headers-2.6.6 142
-MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/mips-headers-2.6.0-fb.patch 386
-MD5 054c3c8e9c8804a13c79d01ec52793ed files/mips-patches-gcc-makefile-fix.patch 915
-MD5 a9f74b71da391afa8399922824c8fc72 files/mips-headers-2.6.6-spaces_h-kernel.patch 498
-MD5 a73786f0b9dda7e9ebacb91a192384f9 files/mips-headers-2.6.0-sysctl_h-compat.patch 352
-MD5 cb8280b584baf48a15e342e96099eeb9 files/mips-headers-2.6.6-appCompat.patch 26265
+MD5 cbe74c305e6226ff772c4d92cba7046a mips-headers-2.4.25.ebuild 1717
+MD5 d432124041d9a53fbc289497d6278048 mips-headers-2.6.6-r1.ebuild 3674
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 747353be86040c7e4c49b553f3467b7c files/digest-mips-headers-2.4.21-r1 160
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r2 145
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r3 145
 MD5 98354eb02ecc6b8d0463a68eba698a85 files/digest-mips-headers-2.4.22-r1 144
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 b7b1f3cc3d41e54d5a23057bc0c83fb5 files/digest-mips-headers-2.4.23 144
+MD5 8562fc546fe46ec1c6a192ad3d61532d files/digest-mips-headers-2.4.25 143
+MD5 47f57c5b40dfb04d3bdbc16989a2d151 files/digest-mips-headers-2.6.6-r1 142
+MD5 8a065c0dc3b8fac8747de35f1af75a2c files/mips-headers-2.6.0-fb.patch 386
+MD5 a73786f0b9dda7e9ebacb91a192384f9 files/mips-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 598136365858338b26557b7587c6725f files/mips-headers-2.6.3-strict-ansi-fix.patch 4166
+MD5 cb8280b584baf48a15e342e96099eeb9 files/mips-headers-2.6.6-appCompat.patch 26265
+MD5 a9f74b71da391afa8399922824c8fc72 files/mips-headers-2.6.6-spaces_h-kernel.patch 498
+MD5 054c3c8e9c8804a13c79d01ec52793ed files/mips-patches-gcc-makefile-fix.patch 915
+MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.6.6 b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.6-r1
index 88daf62c7354..88daf62c7354 100644
--- a/sys-kernel/mips-headers/files/digest-mips-headers-2.6.6
+++ b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.6-r1
diff --git a/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild b/sys-kernel/mips-headers/mips-headers-2.6.6-r1.ebuild
index ef93f6d4a492..914b55d0562f 100644
--- a/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.6.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.6.ebuild,v 1.4 2004/07/15 03:53:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.6-r1.ebuild,v 1.1 2004/08/30 22:59:20 kumba Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -58,25 +58,40 @@ src_unpack() {
 }
 
 src_compile() {
+	local my_defconfig hcflags
+
 	# Avoid issues w/ ARCH
-	MY_ARCH=${ARCH}
-	unset ${ARCH}
+	set_arch_to_kernel
+
+	# Imported from linux26-headers
+	# autoconf.h isnt generated unless it already exists. plus, we have no guarentee that 
+	# any headers are installed on the system...
+	[ -f ${ROOT}/usr/include/linux/autoconf.h ] || touch ${S}/include/linux/autoconf.h
+
+	# CFLAGS for the kernel defconfig
+	hcflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/"
 
-	# Build the right defconfig
+	# Set the right defconfig
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		make cobalt_defconfig
+		my_defconfig="cobalt_defconfig"
 	else
 		# SGI Machine?
 		case "$(uname -i)" in
-			"SGI Indy"|"SGI Indigo2"|"SGI IP22")	make ip22_defconfig ;;
-			"SGI Origin"|"SGI IP27")		make ip27_defconfig ;;
-#			"SGI Octane"|"SGI IP30")		make ip30_defconfig ;;	# Not available yet
-			"SGI O2"|"SGI IP32")			make ip32_defconfig ;;
+			"SGI Indy"|"SGI Indigo2"|"SGI IP22")	my_defconfig="ip22_defconfig" ;;
+			"SGI Origin"|"SGI IP27")		my_defconfig="ip27_defconfig" ;;
+			"SGI Octane"|"SGI IP30")		my_defconfig="ip30_defconfig" ;;
+			"SGI O2"|"SGI IP32")			my_defconfig="ip32_defconfig" ;;
 		esac
 	fi
 
+	# Run defconfig
+	make ${my_defconfig} HOSTCFLAGS="${hcflags}"
+
+	# "Prepare" certain files
+	make prepare HOSTCFLAGS="${hcflags}"
+
 	# Back to normal
-	ARCH=${MY_ARCH}
+	set_arch_to_portage
 }
 
 src_install() {