diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2009-03-22 10:50:32 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2009-03-22 10:50:32 +0000 |
| commit | 96fd8ac17982ca6db68d8dc5d653ea0f3e30ff6e (patch) | |
| tree | af1ee0338c8586cf6d699a2cebb3fecb7e097099 /dev-util | |
| parent | CPUFreq regression has been fixed, no need for p.mask: bug 247614 (diff) | |
| download | gentoo-2-96fd8ac17982ca6db68d8dc5d653ea0f3e30ff6e.tar.gz gentoo-2-96fd8ac17982ca6db68d8dc5d653ea0f3e30ff6e.tar.bz2 gentoo-2-96fd8ac17982ca6db68d8dc5d653ea0f3e30ff6e.zip | |
Fix bug #260744 (compilation problems with GCC 4.3.3+).
(Portage version: 2.1.6.9/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'dev-util')
3 files changed, 30 insertions, 3 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/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() { |