Add a patch for the 'x86' unified kernel architecture.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 45 insertions, 7 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/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7e497e4849ab..e450c3e66187 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 AUX 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae
+AUX 256.35-unified-arch.patch 1498 RMD160 63285585705b880f4e745e1f6ffad493ea876d05 SHA1 a2537442b2d896cd8b6e8897b345fee3bfcf5222 SHA256 7861431595e425c5df8acffb8bf536befa7a13618d6f66456aef6dac4db5c314
 AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da
 AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf
 AUX eblits/donvidia.eblit 695 RMD160 e83869944dfce52a62423412e6c22b4e4468bc3c SHA1 0c877bbe4402c2845f8f4353c9f2d8086d364fbc SHA256 d404dd7e5657d83ccf3687720fb978030a3716e47957fb8bb80dea3ed57b3672
@@ -61,16 +62,16 @@ EBUILD nvidia-drivers-190.53.ebuild 15433 RMD160 9c022ae67a85daa45f44f276c94c75a
 EBUILD nvidia-drivers-195.30.ebuild 15598 RMD160 fedc138e6c200cfe810cec81fd346168d2f09da8 SHA1 252a43050c78afe4d77281eea38f2ad7715151c7 SHA256 2fb38cb81fe6e43eb42e231c8eaf9354fe402ef94e098d9c864b838ac16a6706
 EBUILD nvidia-drivers-195.36.15.ebuild 16149 RMD160 0e82b294567c5f16628f4152199b654e29d97fdf SHA1 e4ce7197812e1c0cf0ae80b07a62cce5c44091f3 SHA256 4692121483572b555b504de360c484845b4d3f3217219783d9046bb841474aab
 EBUILD nvidia-drivers-195.36.24.ebuild 16147 RMD160 b040b95065ab8d62b3e28dc4c9a0de14eab64563 SHA1 01ad21f705ef8d5628c112c5fa35a41b9c0f45b2 SHA256 51f9c4476d5cdd18a8b17898a2236325ab6d9a6dc17b7ec09d7b13c17b15dfa3
-EBUILD nvidia-drivers-256.35.ebuild 14836 RMD160 e9db68fdf167e46aaaa3ad6c7420eec113960cf0 SHA1 b1e69486920338b1f885f8ead9e26a1782bd3241 SHA256 072fd949f389f80eeaacd2f2ff607c68c1abab056ff33cbb7fb7b755f03e804e
+EBUILD nvidia-drivers-256.35.ebuild 14951 RMD160 a69ca7f5f018403872b2d874d5fbabeaf73c9210 SHA1 f352f2044a78141ea739c238750a3b52e62709bb SHA256 43180761a061a63220298a71be4d89aca091936182819b7959c813676fddfbb4
 EBUILD nvidia-drivers-71.86.11.ebuild 14141 RMD160 e1ca921a6dc2381be5acf05afa3933129feaaad1 SHA1 f71d5bf4a065ae475d0f4ae48d1b1cac802a1502 SHA256 7eab9ddf9cd45b876d4fd57cd204edbb6080261306a1804220b5ef808b64cd64
 EBUILD nvidia-drivers-96.43.14.ebuild 15370 RMD160 b14c286fc0eba4066ac78f3603223f404d3c293f SHA1 9526821a410c553c26e41f610502297b12bcd330 SHA256 05f4a3bab44153cef7c0eb09e8dbdcaca73c3391eb7c18a2a47ccd798cbd8255
 EBUILD nvidia-drivers-96.43.16.ebuild 15370 RMD160 3cca3242c024470a3b4ea80c74a676a477a96fde SHA1 8d1cd290a0ac263e311fd2b8755cff834e16c62a SHA256 8fd4fa32f1067998b1a711f00c3e3c2bf4752e5c91575e1cd04e7fc1f5d7d1f3
-MISC ChangeLog 50779 RMD160 9a320816a9900af07b21124f492af545a62efbd0 SHA1 bd7ae58d123628a90f5e0bf462cc2b5fc7d3f06a SHA256 6e06d28630344932e94f6d5c954cd69ac1414629deaea9e61bad9ec85432adae
+MISC ChangeLog 50957 RMD160 9e140246997c4be91bf378c3a03a7119c9d9fb31 SHA1 656d5400e9536d3134d64416dbca32638c4e2064 SHA256 5a353690063b320d6c422bd4668b48235f75ddec4cec2ba042b0648c93222d20
 MISC metadata.xml 608 RMD160 69923c951a3b11d3632338cd673430c1335f78cd SHA1 febe635634c122bf9fb5fd83fd486ab5a25282b3 SHA256 6b13dc244ff827b23a6f1de01eef3a7f607917573fb36b7316a1a629c78cc6bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwitusACgkQchej4aZK9/f58ACfR9cU9OPpAD6UAVdL6+0Esyxp
-2iMAni3SK0h42Fo9kI8fVlJO14/1mlad
-=8L8H
+iEYEARECAAYFAkwjeAMACgkQchej4aZK9/epPgCggF9B6AqmEoLKwaqMJZCGaIHY
+uFoAnA/Ay+AqSGz0TlOr63qo5o+Mot74
+=v3AJ
 -----END PGP SIGNATURE-----
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