diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2010-06-24 15:21:28 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2010-06-24 15:21:28 +0000 |
| commit | 47b6d1d56ddf4835cf5a7ca59272faa0f460ddbf (patch) | |
| tree | fabfa216bce051e0f721f08a489d34fff6e044eb /x11-drivers/nvidia-drivers | |
| parent | <http://my.opera.com/desktopteam/blog/2010/06/24/more-stability-work>. (diff) | |
| download | gentoo-2-47b6d1d56ddf4835cf5a7ca59272faa0f460ddbf.tar.gz gentoo-2-47b6d1d56ddf4835cf5a7ca59272faa0f460ddbf.tar.bz2 gentoo-2-47b6d1d56ddf4835cf5a7ca59272faa0f460ddbf.zip | |
Add a patch for the 'x86' unified kernel architecture.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers/nvidia-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch | 30 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-256.35.ebuild | 5 |
3 files changed, 39 insertions, 2 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 115c094bd8d8..83e82677a327 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.230 2010/06/24 01:37:36 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.231 2010/06/24 15:21:28 spock Exp $ + + 24 Jun 2010; Michał Januszewski <spock@gentoo.org> + +files/256.35-unified-arch.patch, nvidia-drivers-256.35.ebuild: + Add a patch for the 'x86' unified kernel architecture. *nvidia-drivers-256.35 (24 Jun 2010) diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch new file mode 100644 index 000000000000..da92b8f0803f --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch @@ -0,0 +1,30 @@ +diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh +--- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh 2010-05-19 05:38:57.000000000 +0200 ++++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh 2010-05-22 02:13:56.000000000 +0200 +@@ -101,7 +101,7 @@ build_cflags() { + + if [ "$OUTPUT" != "$SOURCES" ]; then + MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" + fi +@@ -110,7 +110,7 @@ build_cflags() { + fi + else + MACH_CFLAGS="-I$HEADERS/asm/mach-default" +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" + fi +@@ -121,7 +121,7 @@ build_cflags() { + + CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" + +- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then ++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then + CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" + fi + if [ -n "$BUILD_PARAMS" ]; then diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-256.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-256.35.ebuild index 56df4b5b0f23..8b3a12067915 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-256.35.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-256.35.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.35.ebuild,v 1.1 2010/06/24 01:37:36 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.35.ebuild,v 1.2 2010/06/24 15:21:28 spock Exp $ EAPI="2" @@ -266,6 +266,9 @@ src_prepare() { # If you set this then it's your own fault when stuff breaks :) use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* + # Add support for the 'x86' unified kernel arch in conftest.sh + epatch "${FILESDIR}"/256.35-unified-arch.patch + # If greater than 2.6.5 use M= instead of SUBDIR= convert_to_m "${NV_SRC}"/Makefile.kbuild fi |