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: 256.35-unified-arch.patch
Date: Thu, 24 Jun 2010 16:08:06
Message-Id: 20100624152128.96AA42CF49@corvid.gentoo.org
1 spock 10/06/24 15:21:28
2
3 Added: 256.35-unified-arch.patch
4 Log:
5 Add a patch for the 'x86' unified kernel architecture.
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch?rev=1.1&content-type=text/plain
13
14 Index: 256.35-unified-arch.patch
15 ===================================================================
16 diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh
17 --- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh 2010-05-19 05:38:57.000000000 +0200
18 +++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh 2010-05-22 02:13:56.000000000 +0200
19 @@ -101,7 +101,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 @@ -110,7 +110,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 @@ -121,7 +121,7 @@ build_cflags() {
38
39 CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
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