Gentoo Archives: gentoo-commits

From: "Michael Januszewski (spock)" <spock@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers/files: 195.30-unified-arch.patch
Date: Sun, 07 Feb 2010 22:11:42
Message-Id: E1NeFLu-00035q-6G@stork.gentoo.org
1 spock 10/02/07 22:11:38
2
3 Added: 195.30-unified-arch.patch
4 Log:
5 Add support for the unified 'x86' kernel architecture.
6 (Portage version: 2.2_rc62/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch?rev=1.1&content-type=text/plain
13
14 Index: 195.30-unified-arch.patch
15 ===================================================================
16 diff -Naurp NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh
17 --- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh 2010-02-07 22:53:38.000000000 +0100
18 +++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh 2010-02-07 22:57:10.000000000 +0100
19 @@ -82,7 +82,7 @@ build_cflags() {
20
21 if [ "$OUTPUT" != "$SOURCES" ]; then
22 MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
23 - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
24 + if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
25 MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
26 MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
27 fi
28 @@ -91,7 +91,7 @@ build_cflags() {
29 fi
30 else
31 MACH_CFLAGS="-I$HEADERS/asm/mach-default"
32 - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
33 + if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
34 MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
35 MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
36 fi
37 @@ -102,7 +102,7 @@ build_cflags() {
38
39 CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"
40
41 - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
42 + if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
43 CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
44 fi
45 if [ -n "$BUILD_PARAMS" ]; then