public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-sdk: ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
@ 2014-08-21  8:58 Justin Lecher (jlec)
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2014-08-21  8:58 UTC (permalink / raw
  To: gentoo-commits

jlec        14/08/21 08:58:16

  Modified:             ChangeLog
  Added:                nvidia-cuda-sdk-6.5.14.ebuild
  Log:
  dev-util/nvidia-cuda-sdk: Version BUmp, #520302
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.50                 dev-util/nvidia-cuda-sdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?r1=1.49&r2=1.50

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	14 Aug 2014 06:11:32 -0000	1.49
+++ ChangeLog	21 Aug 2014 08:58:16 -0000	1.50
@@ -1,6 +1,11 @@
 # 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.49 2014/08/14 06:11:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.50 2014/08/21 08:58:16 jlec Exp $
+
+*nvidia-cuda-sdk-6.5.14 (21 Aug 2014)
+
+  21 Aug 2014; Justin Lecher <jlec@gentoo.org> +nvidia-cuda-sdk-6.5.14.ebuild:
+  Version BUmp, #520302
 
   14 Aug 2014; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Drop unused local USE-description: 'emulation'



1.1                  dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.1&content-type=text/plain

Index: nvidia-cuda-sdk-6.5.14.ebuild
===================================================================
# 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.5.14.ebuild,v 1.1 2014/08/21 08:58:16 jlec Exp $

EAPI=5

inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator

MYD=$(get_version_component_range 1)_$(get_version_component_range 2)

DESCRIPTION="NVIDIA CUDA Software Development Kit"
HOMEPAGE="http://developer.nvidia.com/cuda"
CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
SRC_URI="amd64? ( ${CURI}/cuda_${PV}_linux_64.run )"

LICENSE="CUDPP"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug +doc +examples opencl +cuda"

RDEPEND="
	~dev-util/nvidia-cuda-toolkit-${PV}
	media-libs/freeglut
	examples? (
		media-libs/freeimage
		media-libs/glew
		virtual/mpi
		>=x11-drivers/nvidia-drivers-334.16-r7[uvm]
		)"
DEPEND="${RDEPEND}"

RESTRICT="test"

S=${WORKDIR}/cuda-samples

QA_EXECSTACK=(
	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
	)

src_unpack() {
	unpacker
	unpacker run_files/cuda-samples*run
}

pkg_setup() {
	if use cuda || use opencl; then
		cuda_pkg_setup
	fi
}

src_prepare() {
	export RAWLDFLAGS="$(raw-ldflags)"
#	epatch "${FILESDIR}"/${P}-asneeded.patch

	sed \
		-e 's:-O2::g' \
		-e 's:-O3::g' \
		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
		-e "/CC/s:gcc:$(tc-getCC):g" \
		-e "/GCC/s:g++:$(tc-getCXX):g" \
		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
		-e 's:-Wimplicit::g' \
		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
		-i $(find . -type f -name "Makefile") || die

#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
	find common/inc/GL -delete || die
	find . -type f -name "*\.a" -delete || die
}

src_compile() {
	use examples || return
	local myopts verbose="verbose=1"
	use debug && myopts+=" dbg=1"
	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
	emake \
		cuda-install="${EPREFIX}/opt/cuda" \
		CUDA_PATH="${EPREFIX}/opt/cuda/" \
		MPI_GCC=10 \
		${myopts} ${verbose}
}

src_test() {
	local _dir _subdir

	addwrite /dev/nvidiactl
	addwrite /dev/nvidia0

	for _dir in {0..9}*; do
		pushd ${_dir} > /dev/null
		for _subdir in *; do
			emake -C ${_subdir} run
		done
		popd > /dev/null
	done
}

src_install() {
	local i j f t crap=""

	if use doc; then
		ebegin "Installing docs ..."
			dodoc -r doc
			dodoc *.txt */*.pdf
			treecopy $(find -type f -name readme.txt) "${ED}"/usr/share/doc/${PF}/
		eend
	fi

	crap+=" *.txt doc Samples.htm* */*.pdf"

	ebegin "Cleaning before installation..."
		for i in ${crap}; do
			if [[ -e ${i} ]]; then
				find ${i} -delete || die
			fi
		done
		find -type f -name "*.o" -delete
		find -type f -name "readme.txt" -delete
	eend

	ebegin "Moving files..."
		for f in $(find .); do
			local t="$(dirname ${f})"
			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
				continue
			fi
			if [[ ! -d ${f} ]]; then
				if [[ -x ${f} ]]; then
					exeinto /opt/cuda/sdk/${t}
					doexe ${f}
				else
					insinto /opt/cuda/sdk/${t}
					doins ${f}
				fi
			fi
	done
	eend
}





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-sdk: ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
@ 2014-08-21 13:50 Justin Lecher (jlec)
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2014-08-21 13:50 UTC (permalink / raw
  To: gentoo-commits

jlec        14/08/21 13:50:16

  Modified:             ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
  Log:
  dev-util/nvidia-cuda-sdk: Fix doc installation, thanks mabre telling me that
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.51                 dev-util/nvidia-cuda-sdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?r1=1.50&r2=1.51

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog	21 Aug 2014 08:58:16 -0000	1.50
+++ ChangeLog	21 Aug 2014 13:50:16 -0000	1.51
@@ -1,6 +1,9 @@
 # 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.50 2014/08/21 08:58:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.51 2014/08/21 13:50:16 jlec Exp $
+
+  21 Aug 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.5.14.ebuild:
+  Fix doc installation, thanks mabre telling me that
 
 *nvidia-cuda-sdk-6.5.14 (21 Aug 2014)
 



1.2                  dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?r1=1.1&r2=1.2

Index: nvidia-cuda-sdk-6.5.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-cuda-sdk-6.5.14.ebuild	21 Aug 2014 08:58:16 -0000	1.1
+++ nvidia-cuda-sdk-6.5.14.ebuild	21 Aug 2014 13:50:16 -0000	1.2
@@ -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.5.14.ebuild,v 1.1 2014/08/21 08:58:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v 1.2 2014/08/21 13:50:16 jlec Exp $
 
 EAPI=5
 
@@ -108,13 +108,12 @@
 
 	if use doc; then
 		ebegin "Installing docs ..."
-			dodoc -r doc
-			dodoc *.txt */*.pdf
-			treecopy $(find -type f -name readme.txt) "${ED}"/usr/share/doc/${PF}/
+			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
+			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
 		eend
 	fi
 
-	crap+=" *.txt doc Samples.htm* */*.pdf"
+	crap+=" *.txt Samples.htm*"
 
 	ebegin "Cleaning before installation..."
 		for i in ${crap}; do
@@ -122,8 +121,7 @@
 				find ${i} -delete || die
 			fi
 		done
-		find -type f -name "*.o" -delete
-		find -type f -name "readme.txt" -delete
+		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
 	eend
 
 	ebegin "Moving files..."





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-sdk: ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
@ 2014-09-15 18:56 Justin Lecher (jlec)
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2014-09-15 18:56 UTC (permalink / raw
  To: gentoo-commits

jlec        14/09/15 18:56:32

  Modified:             ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
  Log:
  dev-util/nvidia-cuda-sdk: Fix min nvidia-drivers version, thanks Marius Brehler for reporting, #521480
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.52                 dev-util/nvidia-cuda-sdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?r1=1.51&r2=1.52

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog	21 Aug 2014 13:50:16 -0000	1.51
+++ ChangeLog	15 Sep 2014 18:56:32 -0000	1.52
@@ -1,6 +1,9 @@
 # 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.51 2014/08/21 13:50:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.52 2014/09/15 18:56:32 jlec Exp $
+
+  15 Sep 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.5.14.ebuild:
+  Fix min nvidia-drivers version, thanks Marius Brehler for reporting, #521480
 
   21 Aug 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.5.14.ebuild:
   Fix doc installation, thanks mabre telling me that



1.3                  dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?r1=1.2&r2=1.3

Index: nvidia-cuda-sdk-6.5.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-cuda-sdk-6.5.14.ebuild	21 Aug 2014 13:50:16 -0000	1.2
+++ nvidia-cuda-sdk-6.5.14.ebuild	15 Sep 2014 18:56:32 -0000	1.3
@@ -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.5.14.ebuild,v 1.2 2014/08/21 13:50:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v 1.3 2014/09/15 18:56:32 jlec Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@
 		media-libs/freeimage
 		media-libs/glew
 		virtual/mpi
-		>=x11-drivers/nvidia-drivers-334.16-r7[uvm]
+		>=x11-drivers/nvidia-drivers-334.32[uvm]
 		)"
 DEPEND="${RDEPEND}"
 





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-sdk: ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
@ 2014-09-17  6:48 Justin Lecher (jlec)
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2014-09-17  6:48 UTC (permalink / raw
  To: gentoo-commits

jlec        14/09/17 06:48:21

  Modified:             ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
  Log:
  dev-util/nvidia-cuda-sdk: Fix nvidia drivers dep version, thanks Marius Brehler noticing the typo
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.53                 dev-util/nvidia-cuda-sdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?r1=1.52&r2=1.53

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog	15 Sep 2014 18:56:32 -0000	1.52
+++ ChangeLog	17 Sep 2014 06:48:21 -0000	1.53
@@ -1,6 +1,9 @@
 # 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.52 2014/09/15 18:56:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.53 2014/09/17 06:48:21 jlec Exp $
+
+  17 Sep 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.5.14.ebuild:
+  Fix nvidia drivers dep version, thanks Marius Brehler noticing the typo
 
   15 Sep 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.5.14.ebuild:
   Fix min nvidia-drivers version, thanks Marius Brehler for reporting, #521480



1.4                  dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?r1=1.3&r2=1.4

Index: nvidia-cuda-sdk-6.5.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-cuda-sdk-6.5.14.ebuild	15 Sep 2014 18:56:32 -0000	1.3
+++ nvidia-cuda-sdk-6.5.14.ebuild	17 Sep 2014 06:48:21 -0000	1.4
@@ -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.5.14.ebuild,v 1.3 2014/09/15 18:56:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v 1.4 2014/09/17 06:48:21 jlec Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@
 		media-libs/freeimage
 		media-libs/glew
 		virtual/mpi
-		>=x11-drivers/nvidia-drivers-334.32[uvm]
+		>=x11-drivers/nvidia-drivers-340.32[uvm]
 		)"
 DEPEND="${RDEPEND}"
 





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-sdk: ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
@ 2014-09-19  9:14 Justin Lecher (jlec)
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher (jlec) @ 2014-09-19  9:14 UTC (permalink / raw
  To: gentoo-commits

jlec        14/09/19 09:14:35

  Modified:             ChangeLog nvidia-cuda-sdk-6.5.14.ebuild
  Log:
  dev-util/nvidia-cuda-sdk: Fix double definition of c++ compiler, #523142
  
  (Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.54                 dev-util/nvidia-cuda-sdk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog?r1=1.53&r2=1.54

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog	17 Sep 2014 06:48:21 -0000	1.53
+++ ChangeLog	19 Sep 2014 09:14:35 -0000	1.54
@@ -1,6 +1,9 @@
 # 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.53 2014/09/17 06:48:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.54 2014/09/19 09:14:35 jlec Exp $
+
+  19 Sep 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.5.14.ebuild:
+  Fix double definition of c++ compiler, #523142
 
   17 Sep 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.5.14.ebuild:
   Fix nvidia drivers dep version, thanks Marius Brehler noticing the typo



1.5                  dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild?r1=1.4&r2=1.5

Index: nvidia-cuda-sdk-6.5.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-cuda-sdk-6.5.14.ebuild	17 Sep 2014 06:48:21 -0000	1.4
+++ nvidia-cuda-sdk-6.5.14.ebuild	19 Sep 2014 09:14:35 -0000	1.5
@@ -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.5.14.ebuild,v 1.4 2014/09/17 06:48:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v 1.5 2014/09/19 09:14:35 jlec Exp $
 
 EAPI=5
 
@@ -62,6 +62,7 @@
 		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
 		-e "/CC/s:gcc:$(tc-getCC):g" \
 		-e "/GCC/s:g++:$(tc-getCXX):g" \
+		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
 		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
 		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
 		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \





^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-09-19  9:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-17  6:48 [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-sdk: ChangeLog nvidia-cuda-sdk-6.5.14.ebuild Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2014-09-19  9:14 Justin Lecher (jlec)
2014-09-15 18:56 Justin Lecher (jlec)
2014-08-21 13:50 Justin Lecher (jlec)
2014-08-21  8:58 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox