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 <[email protected]> nvidia-cuda-sdk-6.5.14.ebuild:
+  Fix double definition of c++ compiler, #523142
 
   17 Sep 2014; Justin Lecher <[email protected]> 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" \




Reply via email to