diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-02-01 17:16:29 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-02-01 17:16:29 +0000 |
| commit | 66d0b3d5cc85b4eb166d93247524f94b768e6337 (patch) | |
| tree | 1bb2531e9518087820c814a8552da07b4d19b6f8 /media-video | |
| parent | Masked porthole, as it is br0ken (diff) | |
| download | gentoo-2-66d0b3d5cc85b4eb166d93247524f94b768e6337.tar.gz gentoo-2-66d0b3d5cc85b4eb166d93247524f94b768e6337.tar.bz2 gentoo-2-66d0b3d5cc85b4eb166d93247524f94b768e6337.zip | |
Fix for bug #40050. Doing make module for 2.4 Makefile and make nvidia.o for 2.6 Makefile.
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/nvidia-kernel/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild | 12 |
2 files changed, 15 insertions, 4 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog index a9b845887de6..72209e236274 100644 --- a/media-video/nvidia-kernel/ChangeLog +++ b/media-video/nvidia-kernel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/nvidia-kernel # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.61 2004/02/01 15:13:47 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.62 2004/02/01 17:16:29 spyderous Exp $ + + 01 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; + nvidia-kernel-1.0.5336-r1.ebuild: + Fix for bug #40050. Doing make module for 2.4 Makefile and make nvidia.o for + 2.6 Makefile. *nvidia-kernel-1.0.5336-r1 (01 Feb 2004) diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild index f3b78219ed19..23e0cde97e81 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild,v 1.1 2004/02/01 15:13:47 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild,v 1.2 2004/02/01 17:16:29 spyderous Exp $ inherit eutils @@ -111,8 +111,14 @@ src_compile() { # updated but the running kernel is still compiled with an older gcc. This is # needed for chrooted building, where the sanity check detects the gcc of the # kernel outside the chroot rather than within. - make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \ - clean nvidia.o || die + if is_kernel 2 5 || is_kernel 2 6 + then + make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \ + clean nvidia.o || die + else + make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \ + clean module || die + fi } src_install() { |