public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-toolkit: nvidia-cuda-toolkit-5.0.35-r4.ebuild ChangeLog nvidia-cuda-toolkit-4.2.9-r3.ebuild nvidia-cuda-toolkit-5.0.35-r2.ebuild nvidia-cuda-toolkit-5.5.22.ebuild nvidia-cuda-toolkit-5.0.35-r3.ebuild nvidia-cuda-toolkit-4.2.9-r2.ebuild
@ 2013-08-11 12:16 Justin Lecher (jlec)
  0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2013-08-11 12:16 UTC (permalink / raw
  To: gentoo-commits

jlec        13/08/11 12:16:43

  Modified:             nvidia-cuda-toolkit-5.0.35-r4.ebuild ChangeLog
                        nvidia-cuda-toolkit-4.2.9-r3.ebuild
                        nvidia-cuda-toolkit-5.0.35-r2.ebuild
                        nvidia-cuda-toolkit-5.0.35-r3.ebuild
                        nvidia-cuda-toolkit-4.2.9-r2.ebuild
  Added:                nvidia-cuda-toolkit-5.5.22.ebuild
  Log:
  dev-util/nvidia-cuda-toolkit: Version Bump, #479374; fix license, #466576
  
  (Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.2                  dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild

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

Index: nvidia-cuda-toolkit-5.0.35-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-cuda-toolkit-5.0.35-r4.ebuild	20 Apr 2013 15:04:03 -0000	1.1
+++ nvidia-cuda-toolkit-5.0.35-r4.ebuild	11 Aug 2013 12:16:42 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild,v 1.1 2013/04/20 15:04:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild,v 1.2 2013/08/11 12:16:42 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@
 	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
 
 SLOT="0/${PV}"
-LICENSE="NVIDIA-r1"
+LICENSE="NVIDIA-CUDA"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 



1.70                 dev-util/nvidia-cuda-toolkit/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	26 Jun 2013 00:19:39 -0000	1.69
+++ ChangeLog	11 Aug 2013 12:16:42 -0000	1.70
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.69 2013/06/26 00:19:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.70 2013/08/11 12:16:42 jlec Exp $
+
+*nvidia-cuda-toolkit-5.5.22 (11 Aug 2013)
+
+  11 Aug 2013; Justin Lecher <jlec@gentoo.org>
+  nvidia-cuda-toolkit-4.2.9-r2.ebuild, nvidia-cuda-toolkit-4.2.9-r3.ebuild,
+  nvidia-cuda-toolkit-5.0.35-r2.ebuild, nvidia-cuda-toolkit-5.0.35-r3.ebuild,
+  nvidia-cuda-toolkit-5.0.35-r4.ebuild, +nvidia-cuda-toolkit-5.5.22.ebuild:
+  Version Bump, #479374; fix license, #466576
 
   26 Jun 2013; Christoph Junghans <ottxor@gentoo.org> metadata.xml:
   remove myself as maintainer



1.2                  dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild

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

Index: nvidia-cuda-toolkit-4.2.9-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-cuda-toolkit-4.2.9-r3.ebuild	20 Apr 2013 15:04:03 -0000	1.1
+++ nvidia-cuda-toolkit-4.2.9-r3.ebuild	11 Aug 2013 12:16:42 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild,v 1.1 2013/04/20 15:04:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild,v 1.2 2013/08/11 12:16:42 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@
 	x86? ( ${CURI}/cudatoolkit_${PV}_linux_32_${DISTRO}.run )"
 
 SLOT="0/${PV}"
-LICENSE="NVIDIA-r1"
+LICENSE="NVIDIA-CUDA"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 



1.5                  dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild

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

Index: nvidia-cuda-toolkit-5.0.35-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-cuda-toolkit-5.0.35-r2.ebuild	20 Apr 2013 15:04:03 -0000	1.4
+++ nvidia-cuda-toolkit-5.0.35-r2.ebuild	11 Aug 2013 12:16:42 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild,v 1.4 2013/04/20 15:04:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild,v 1.5 2013/08/11 12:16:42 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@
 	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
 
 SLOT="0"
-LICENSE="NVIDIA-r1"
+LICENSE="NVIDIA-CUDA"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 



1.3                  dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild

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

Index: nvidia-cuda-toolkit-5.0.35-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-cuda-toolkit-5.0.35-r3.ebuild	20 Apr 2013 15:04:03 -0000	1.2
+++ nvidia-cuda-toolkit-5.0.35-r3.ebuild	11 Aug 2013 12:16:42 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild,v 1.2 2013/04/20 15:04:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild,v 1.3 2013/08/11 12:16:42 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@
 	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
 
 SLOT="0"
-LICENSE="NVIDIA-r1"
+LICENSE="NVIDIA-CUDA"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 



1.6                  dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild

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

Index: nvidia-cuda-toolkit-4.2.9-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nvidia-cuda-toolkit-4.2.9-r2.ebuild	20 Apr 2013 15:04:03 -0000	1.5
+++ nvidia-cuda-toolkit-4.2.9-r2.ebuild	11 Aug 2013 12:16:42 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild,v 1.5 2013/04/20 15:04:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild,v 1.6 2013/08/11 12:16:42 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@
 	x86? ( ${CURI}/cudatoolkit_${PV}_linux_32_${DISTRO}.run )"
 
 SLOT="0"
-LICENSE="NVIDIA-r1"
+LICENSE="NVIDIA-CUDA"
 KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 



1.1                  dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild

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

Index: nvidia-cuda-toolkit-5.5.22.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild,v 1.1 2013/08/11 12:16:42 jlec Exp $

EAPI=5

inherit cuda unpacker versionator

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

DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
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 )
	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"

SLOT="0/${PV}"
LICENSE="NVIDIA-CUDA"
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debugger doc examples eclipse profiler"

DEPEND=""
RDEPEND="${DEPEND}
	sys-devel/gcc:4.6[cxx]
	!<=x11-drivers/nvidia-drivers-270.41
	debugger? (
		sys-libs/libtermcap-compat
		sys-libs/ncurses[tinfo]
		)
	eclipse? ( >=virtual/jre-1.6 )
	profiler? ( >=virtual/jre-1.6 )"

S="${WORKDIR}"

QA_PREBUILT="opt/cuda/*"

pkg_setup() {
	# We don't like to run cuda_pkg_setup as it depends on us
	:
}

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

src_prepare() {
	local cuda_supported_gcc

	cuda_supported_gcc="4.7"

	sed \
		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
}

src_install() {
	local i j
	local remove="doc jre run_files install-linux.pl "
	local cudadir=/opt/cuda
	local ecudadir="${EPREFIX}"${cudadir}

	# dodoc doc/*txt
	if use doc; then
		dodoc doc/pdf/*
		dohtml -r doc/html/*
	fi

	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
	( use profiler || use eclipse ) || remove+=" libnsight"
	use amd64 || remove+=" cuda-installer.pl"

	if use examples; then
		insinto /usr/share/doc/${PN}
		doins -r cuda-samples
	fi
	find cuda-samples -delete || die

	if use profiler; then
		# hack found in install-linux.pl
		for j in nvvp nsight; do
			cat > bin/${j} <<- EOF
				#!${EPREFIX}/bin/sh
				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
			EOF
			chmod a+x bin/${j}
		done
	else
		use eclipse || remove+=" libnvvp"
		remove+=" extras/CUPTI"
	fi

	for i in ${remove}; do
	ebegin "Cleaning ${i}..."
		if [[ -e ${i} ]]; then
			find ${i} -delete || die
			eend
		else
			eend $1
		fi
	done

	dodir ${cudadir}
	mv * "${ED}"${cudadir}

	cat > "${T}"/99cuda <<- EOF
		PATH=${ecudadir}/bin:${ecudadir}/libnvvp
		ROOTPATH=${ecudadir}/bin
		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
	EOF
	doenvd "${T}"/99cuda

	make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")

	dobin "${T}"/cuda-config
}

pkg_postinst() {
	local a b
	a="$(version_sort $(cuda-config -s))"; a=( $a )
	# greatest supported version
	b=${a[${#a[@]}-1]}

	# if gcc and if not gcc-version is at least greatesst supported
	if [[ $(tc-getCC) == *gcc* ]] && \
		! version_is_at_least $(gcc-version) ${b}; then
			echo
			ewarn "gcc >= ${b} will not work with CUDA"
			ewarn "Make sure you set an earlier version of gcc with gcc-config"
			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
			ewarn "to the nvcc compiler flags"
			echo
	fi
}





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-08-11 12:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-11 12:16 [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-toolkit: nvidia-cuda-toolkit-5.0.35-r4.ebuild ChangeLog nvidia-cuda-toolkit-4.2.9-r3.ebuild nvidia-cuda-toolkit-5.0.35-r2.ebuild nvidia-cuda-toolkit-5.5.22.ebuild nvidia-cuda-toolkit-5.0.35-r3.ebuild nvidia-cuda-toolkit-4.2.9-r2.ebuild 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