diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-11-11 23:01:56 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-11-11 23:01:56 +0000 |
| commit | 8c8df2291166204eff5e76ec8986a5b8cc93ef14 (patch) | |
| tree | 0179a33aa18a76f2941aaae3deec3d3ce35aa3d2 /media-video | |
| parent | Fixes #70857 (removed unnecessary banners) (Manifest recommit) (diff) | |
| download | gentoo-2-8c8df2291166204eff5e76ec8986a5b8cc93ef14.tar.gz gentoo-2-8c8df2291166204eff5e76ec8986a5b8cc93ef14.tar.bz2 gentoo-2-8c8df2291166204eff5e76ec8986a5b8cc93ef14.zip | |
Fixed installation on amd64.
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/nvidia-kernel/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/nvidia-kernel/files/1.0.6629/nv-amd64-shutup-warnings.patch | 12 | ||||
| -rw-r--r-- | media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild | 6 |
3 files changed, 22 insertions, 3 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog index a02b629662b9..7320a74d6ad8 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 Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.96 2004/11/09 22:39:36 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.97 2004/11/11 23:01:56 eradicator Exp $ + + 11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> + +files/1.0.6629/nv-amd64-shutup-warnings.patch, + nvidia-kernel-1.0.6629.ebuild: + Fixed installation on amd64. 09 Nov 2004; Martin Schlemmer <azarah@gentoo.org> +files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch, diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-amd64-shutup-warnings.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-amd64-shutup-warnings.patch new file mode 100644 index 000000000000..4093f82a330b --- /dev/null +++ b/media-video/nvidia-kernel/files/1.0.6629/nv-amd64-shutup-warnings.patch @@ -0,0 +1,12 @@ +diff -Naur NVIDIA-Linux-x86_64-1.0-6629-pkg2.orig/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86_64-1.0-6629-pkg2/usr/src/nv/Makefile.kbuild +--- NVIDIA-Linux-x86_64-1.0-6629-pkg2.orig/usr/src/nv/Makefile.kbuild 2004-11-11 14:55:52.000000000 -0800 ++++ NVIDIA-Linux-x86_64-1.0-6629-pkg2/usr/src/nv/Makefile.kbuild 2004-11-11 14:58:11.000000000 -0800 +@@ -73,7 +73,7 @@ + # + + EXTRA_CFLAGS += -I$(src) +-EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith -Wno-multichar -Werror -O -fno-common -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error ++EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wno-multichar -Werror -O -fno-common -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error + + # + # We rely on these two definitions below; if they aren't set, we set them to diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild index 01b24e58f47e..332b340185ca 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.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-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild,v 1.3 2004/11/09 22:39:36 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild,v 1.4 2004/11/11 23:01:56 eradicator Exp $ inherit eutils kernel-mod @@ -96,8 +96,10 @@ src_unpack() { epatch ${FILESDIR}/${PV}/nv-pgd_offset.patch # Fix calling of smp_processor_id() when preempt is enabled epatch ${FILESDIR}/${PV}/nv-disable-preempt-on-smp_processor_id.patch + # Shutup pointer arith warnings - epatch ${FILESDIR}/${PV}/nv-shutup-warnings.patch + use x86 && epatch ${FILESDIR}/${PV}/nv-shutup-warnings.patch + use amd64 && epatch ${FILESDIR}/${PV}/nv-amd64-shutup-warnings.patch # if you set this then it's your own fault when stuff breaks :) [ ! -z "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.* |