Fix bug #260744 (compilation problems with GCC 4.3.3+).

Package-Manager: portage-2.1.6.9/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 37 insertions, 9 deletions

diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index 0f32bad55f85..65d52f400eec 100644
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ b/dev-util/nvidia-cuda-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/nvidia-cuda-sdk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.5 2009/01/21 14:38:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.6 2009/03/22 10:50:32 spock Exp $
+
+  22 Mar 2009; Michał Januszewski <spock@gentoo.org>
+  +files/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch,
+  nvidia-cuda-sdk-2.10.1215.2015.ebuild:
+  Fix bug #260744 (compilation problems with GCC 4.3.3+).
 
 *nvidia-cuda-sdk-2.10.1215.2015 (21 Jan 2009)
 
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index d78ac3b7bb29..23415aca213b 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX nvidia-cuda-sdk-2.02.0807.1535-make_cpp_fix.patch 3398 RMD160 76f03d2e3eb14de8126af87dc0d7f9170f03ffd9 SHA1 df19045a8eab392e464d44bab3a0285ec8104107 SHA256 1b8038fe9ceef35e29e34a30514d16c0e27066311fd7d16e8953b5deaa01da6c
+AUX nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch 785 RMD160 34cc32911f494ba3d03c92728cbc29928e50eb2c SHA1 ba3c5bd6b2e383d45626a3c2c9c9906839112489 SHA256 b685cd8915e45494c0c8c458f607c46d4716deae26442bf62ea9bf8bc3e2e942
 DIST NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run 41918865 RMD160 0ec9bda0e077660540a5a857ba63dbec78611c5e SHA1 5b2e316de5ce35178f6cac9b20e71a51c140f84a SHA256 5ceb6ac9d973b7d3544ed5ee3c52de40451ca234df587fb93bd3c5b73f5610c4
 DIST cuda-sdk-linux-2.10.1215.2015-3233425.run 46618139 RMD160 bfbadee2b669d72e038abf34cb200343a3826465 SHA1 3ef64ffd9d1bc0afe351c80f07d5c2a87e7e044a SHA256 5d9521f049312fc00fef9e9ed6fa2bd8475e0d309dab109da4b663461d9855bb
 EBUILD nvidia-cuda-sdk-2.02.0807.1535.ebuild 1364 RMD160 94b203c79dd7c38b441970639bf18eedbbd65c72 SHA1 b80c603a60901705b18ee5ca45d9b1c75d0673b9 SHA256 d37983fb1ff72f021ac3503abb14aaac8bdbd14ec1c0c76a945dccad44cd2936
-EBUILD nvidia-cuda-sdk-2.10.1215.2015.ebuild 1340 RMD160 b0dec5e26949421de02a3a377aeea465b80bdc0a SHA1 d3c3de0f6d4592a026ea859ef9d6767c96d0730d SHA256 6428b8c801d5b8e82c759514338a9baec73caa7d5ab5c6f5b8cca5dc458d8347
-MISC ChangeLog 1083 RMD160 7f8917ed99aac3877274aaf4ddcd721f80f7e3bb SHA1 cb2a5bd6588cb8645d2f53efef458c1ee3a35a0b SHA256 5f83b06ef0f665157097eb32e65df3ff2f5b06b423eb4a07f9401111d654e1b5
+EBUILD nvidia-cuda-sdk-2.10.1215.2015.ebuild 1417 RMD160 4c96afe778bb635311c9d0ffae3e5774c4393a6c SHA1 e86225e1abe7f5a74a743d15d178810c38e911cb SHA256 d87f811f383b943bbebaed80d5a1f7e79bc7dd5af03476d2456ba728a856b2fd
+MISC ChangeLog 1302 RMD160 6a128e28c41d84a3fad35012c7e1fdc6648ba3de SHA1 4d36c1395e83a1a1c3a73cf3a82d4fe459d96c2a SHA256 1263969aa3984b21dd934b57fe9eec2e9731d4a632e2cab5b2e3fd1512d228a6
 MISC metadata.xml 419 RMD160 182c9ce57a04ae41c2cf85f6f9ec4536d661c759 SHA1 7a1a99d443b61ab8b6256c1f241b78e40c09faf3 SHA256 b690630cd28888964717a3c5aa733889b0dae3434559d1e3b66be8c09f7de912
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkl3M3MACgkQchej4aZK9/egmACgiHlIGy5Bvd6fyEsn9Fi1/B0+
-b+MAnjgRZwTSYp4TO8vh+EtV1hxlFCMl
-=O2IB
+iEYEARECAAYFAknGGAQACgkQchej4aZK9/eI+gCfbFhxIdd2jkqAAvAWTEgAsNix
+kvkAn0zWVjlqoGHJ2t+eKab0fg8IBPmK
+=0rK1
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch
new file mode 100644
index 000000000000..8029abc240d0
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch
@@ -0,0 +1,21 @@
+diff -Naurp cuda-orig/sdk/common/common.mk cuda/sdk/common/common.mk
+--- cuda-orig/sdk/common/common.mk	2009-03-22 10:59:39.000000000 +0100
++++ cuda/sdk/common/common.mk	2009-03-22 11:31:55.000000000 +0100
+@@ -100,6 +99,8 @@ NVCCFLAGS := 
+ CXXFLAGS  := $(CXXWARN_FLAGS)
+ CFLAGS    := $(CWARN_FLAGS)
+ 
++NVCCFLAGS += -include=vararg-fix.h
++
+ # Common flags
+ COMMONFLAGS += $(INCLUDES) -DUNIX
+ 
+diff -Naurp cuda-orig/sdk/common/inc/vararg-fix.h cuda/sdk/common/inc/vararg-fix.h
+--- cuda-orig/sdk/common/inc/vararg-fix.h	1970-01-01 01:00:00.000000000 +0100
++++ cuda/sdk/common/inc/vararg-fix.h	2009-03-22 11:17:11.000000000 +0100
+@@ -0,0 +1,5 @@
++#ifndef __CUDA_VARARG_FIX
++#define __CUDA_VARARG_FIX
++// HACK: avoid compilation errors with GCC 4.3.3+
++int __builtin_va_arg_pack();
++#endif
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.10.1215.2015.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.10.1215.2015.ebuild
index 70f3110ec37a..1a38ea21fe32 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.10.1215.2015.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.10.1215.2015.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.10.1215.2015.ebuild,v 1.1 2009/01/21 14:38:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.10.1215.2015.ebuild,v 1.2 2009/03/22 10:50:32 spock Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	unpack_makeself
 	cd "${S}"
 	sed -i -e 's:CUDA_INSTALL_PATH ?= .*:CUDA_INSTALL_PATH ?= /opt/cuda:' sdk/common/common.mk
+	epatch "${FILESDIR}/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch"
 }
 
 src_compile() {