Stable amd64, x86. Fixed build process to work on newer 2.6 kernels without needing to copy over the kernel source tree.

3 files changed, 25 insertions, 11 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 59f9459dbcfc..54723699b8ce 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.93 2004/08/23 21:44:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.94 2004/09/22 09:32:22 eradicator Exp $
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Stable amd64, x86. Fixed build process to work on newer 2.6 kernels without
+  needing to copy over the kernel source tree.
 
 *alsa-driver-1.0.6a (23 Aug 2004)
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
index 6cd1aad1dcd9..8dc23b92433f 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.6a.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/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild,v 1.1 2004/08/23 21:44:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild,v 1.2 2004/09/22 09:32:22 eradicator Exp $
 
 inherit kernel-mod flag-o-matic eutils
 
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/alsa"
 
 SLOT="${KV}"
-KEYWORDS="~x86 ~ppc -sparc ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc -sparc amd64 ~alpha ~ia64"
 
 MY_P=${P/_rc/rc}
 SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
@@ -42,14 +42,16 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.0.5-devfix.patch
-
 	epatch ${FILESDIR}/${PN}-1.0.5a-cs46xx-passthrough.patch
 
+	# SUBDIRS -> M
+	epatch ${FILESDIR}/${P}-kbuild.patch
+
 	if [ "${PROFILE_ARCH}" == "xbox" ]; then
 		epatch ${FILESDIR}/${PN}-1.0.5a-xbox-ac97.patch
 	fi
 
-	if kernel-mod_is_2_6_kernel || kernel-mod_is_2_5_kernel; then
+	if kernel-mod_is_2_5_kernel || (kernel-mod_is_2_6_kernel && [ ${KV_PATCH} -lt 6 ]); then
 		FULL_KERNEL_PATH="${ROOT}/usr/src/${KV_DIR}"
 
 		if ! [ -d "${FULL_KERNEL_PATH}" ]; then
@@ -68,16 +70,11 @@ src_unpack() {
 
 src_compile() {
 	# Default ARCH & kernel path to set in compilation and make
-	KER_ARCH=${ARCH}
 	KER_DIR=${KERNEL_DIR}
 
 	# If we're using a 2.5 or 2.6 kernel, use our copied kernel tree.
 	if [ -d "${T}/linux" ]; then
 		KER_DIR="${T}/linux"
-
-		# Set the kernel ARCH
-		use x86 && KER_ARCH="i386"
-		use amd64 && KER_ARCH="x86_64"
 	fi
 
 	econf `use_with oss` \
@@ -89,7 +86,8 @@ src_compile() {
 	# Should fix bug #46901
 	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
 
-	emake ARCH="${KER_ARCH}" || die "Parallel Make Failed"
+	unset ARCH
+	emake || die "Parallel Make Failed"
 }
 
 
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.6a-kbuild.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.6a-kbuild.patch
new file mode 100644
index 000000000000..a85165a5dbcd
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.6a-kbuild.patch
@@ -0,0 +1,12 @@
+diff -Naur alsa-driver-1.0.6a.orig/Makefile alsa-driver-1.0.6a/Makefile
+--- alsa-driver-1.0.6a.orig/Makefile	2004-06-09 10:33:47.000000000 -0700
++++ alsa-driver-1.0.6a/Makefile	2004-09-22 02:23:58.924678651 -0700
+@@ -103,7 +103,7 @@
+ .PHONY: compile
+ compile: include/sound/version.h include/sndversions.h
+ ifdef NEW_KBUILD
+-	$(MAKE) -C $(CONFIG_SND_KERNELDIR) SUBDIRS=$(MAINSRCDIR)/kbuild $(MAKE_ADDS) modules
++	$(MAKE) -C $(CONFIG_SND_KERNELDIR) M=$(MAINSRCDIR)/kbuild $(MAKE_ADDS) modules
+ else
+ 	@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d; then exit 1; fi; done
+ endif