summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-12-04 10:12:26 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-12-04 10:12:26 +0000
commitda43ec8093747bce8c0b813e48f41866ba47bbc4 (patch)
treecd4ca23fdda823637487dff8827b621adbc43370 /media-sound
parent Added missing files for ppc build and marked ~ppc, see bug #71286. (Manifest... (diff)
downloadgentoo-2-da43ec8093747bce8c0b813e48f41866ba47bbc4.tar.gz
gentoo-2-da43ec8093747bce8c0b813e48f41866ba47bbc4.tar.bz2
gentoo-2-da43ec8093747bce8c0b813e48f41866ba47bbc4.zip
Updated configure patch to update Makefile.conf.in as well to fix compilation with 2.4 kernels. Closes bug #73290.
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/alsa-driver/ChangeLog7
-rw-r--r--media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch17
2 files changed, 23 insertions, 1 deletions
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 6d238a57e7a1..50788a9d37d0 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
# 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.116 2004/12/02 22:36:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.117 2004/12/04 10:12:26 eradicator Exp $
+
+ 04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ files/alsa-driver-1.0.7-configure.patch:
+ Updated configure patch to update Makefile.conf.in as well to fix
+ compilation with 2.4 kernels. Closes bug #73290.
*alsa-driver-1.0.7-r3 (02 Dec 2004)
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch
index daeada8fac89..d6601dcadcc7 100644
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch
@@ -693,3 +693,20 @@
CONFIG_SND_RTCTIMER=$rtcsup
AC_SUBST(CONFIG_SND_RTCTIMER)
test "$CONFIG_SND_RTCTIMER" = "m" && AC_DEFINE(CONFIG_SND_RTCTIMER_MODULE)
+--- alsa-driver-1.0.7/Makefile.conf.in 2004-10-18 06:04:21.000000000 -0700
++++ alsa-cvs/alsa-driver/Makefile.conf.in 2004-11-23 08:07:56.000000000 -0800
+@@ -9,9 +9,12 @@
+ MAINSRCDIR = @SRCDIR@
+
+ CROSS_COMPILE ?= @CROSS_COMPILE@
+-ifndef NEW_KBUILD
++ARCH ?= @ARCH@
++ifdef NEW_KBUILD
++export CROSS_COMPILE ARCH
++else
+ AS = $(CROSS_COMPILE)@AS@
+-LD = $(CROSS_COMPILE)@LD@
++LD = $(CROSS_COMPILE)@KLD@
+ CC = $(CROSS_COMPILE)@CC@
+ CPP = $(CROSS_COMPILE)@CPP@
+ AR = $(CROSS_COMPILE)@AR@