diff options
Diffstat (limited to 'dev-util/nvidia-cuda-sdk')
| -rw-r--r-- | dev-util/nvidia-cuda-sdk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch | 11 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild | 7 |
3 files changed, 7 insertions, 17 deletions
diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog index eaa7be491b5d..cf72f3a50c6e 100644 --- a/dev-util/nvidia-cuda-sdk/ChangeLog +++ b/dev-util/nvidia-cuda-sdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/nvidia-cuda-sdk # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.45 2014/05/28 09:50:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.46 2014/07/02 13:27:02 jlec Exp $ + + 02 Jul 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.0.37.ebuild, + -files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch: + Drop arch specific patch; #516020 *nvidia-cuda-sdk-6.0.37 (28 May 2014) diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch deleted file mode 100644 index fd8fc59b20c6..000000000000 --- a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cuda-samples/0_Simple/simpleMPI/Makefile -+++ b/cuda-samples/0_Simple/simpleMPI/Makefile -@@ -172,7 +172,7 @@ - MPICXX=mpicxx - EXEC=@echo "[@]" - else -- MPI_GCC := $(shell $(MPICXX) -v 2>&1 | grep x86_64-pc-linux-gnu-gcc | wc -l | tr -d ' ') -+ MPI_GCC := $(shell $(MPICXX) -v 2>&1 | grep gcc | wc -l | tr -d ' ') - ifeq ($(MPI_GCC),0) - MPI_CCFLAGS += -stdlib=libstdc++ - MPI_LDFLAGS += -stdlib=libstdc++ diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild index 74bfdee1b7cc..7ca76f12330f 100644 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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-6.0.37.ebuild,v 1.1 2014/05/28 09:50:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild,v 1.2 2014/07/02 13:27:02 jlec Exp $ EAPI=5 @@ -76,10 +76,6 @@ src_prepare() { # -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \ find common/inc/GL -delete || die find . -type f -name "*\.a" -delete || die - - # sed corrupts the simpleMPI Makefile, resulting in a failed libstdc++ detection. - # Therefore we need this patch, if we don't wont to touch the sed command above. - epatch "${FILESDIR}"/${P}-simpleMPI.patch } src_compile() { @@ -90,6 +86,7 @@ src_compile() { emake \ cuda-install="${EPREFIX}/opt/cuda" \ CUDA_PATH="${EPREFIX}/opt/cuda/" \ + MPI_GCC=10 \ ${myopts} ${verbose} } |