Add support for the CUDA debugger (bug #274100).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 150 insertions, 6 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 6c0602360743..e259a2a61678 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.7 2009/07/05 07:00:11 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.8 2009/07/05 18:49:42 spock Exp $
+
+*nvidia-cuda-toolkit-2.2-r2 (05 Jul 2009)
+
+  05 Jul 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.2-r2.ebuild, metadata.xml:
+  Add support for the CUDA debugger (bug #274100).
 
   05 Jul 2009; Michał Januszewski <spock@gentoo.org>
   nvidia-cuda-toolkit-2.2-r1.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index e55ec194724f..57a8ed842bd4 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,6 +4,8 @@ Hash: SHA1
 AUX nvidia-cuda-toolkit-2.2-enum_fix.patch 1901 RMD160 74aadb45017c94404d6379a0f94b62db38d74656 SHA1 5b79051ddb2701c80331b64d376e6c106c38def6 SHA256 a1917977a94f0439ca3e28be0eb41b9e5c0ca9c03f3a22dc91d6bfdca253b258
 DIST NVIDIA_CUDA_Toolkit_2.0_suse10.3_x86.run 18966963 RMD160 934922578b3320e2cacf4e08a3a51cdbea87be21 SHA1 2e783ed52c73e76655bba54fc83df8b55d6450ae SHA256 fbf3cddc6a7039b853b4c8eb89b2aeb5eb3430f44d95e2e1ae382f78ae90c07e
 DIST NVIDIA_CUDA_Toolkit_2.0_suse10.3_x86_64.run 20245140 RMD160 134b76adc0645568bd7484c085539dfb53e95d89 SHA1 60d8348366d547ad18e44119440d0582de6440d0 SHA256 7ff2685e32e54351a4556d65fc2a2e097e08901614b6763d14ac31824d975bb6
+DIST cudagdb_2.2_linux_32_rhel5.3.run 1181310 RMD160 44c69588df4dde25b93fb9115adccbf2a00a5371 SHA1 8628be1a53251237ec31639e9acd6d95831ea33e SHA256 72ab11691bf8feb5d5dbdab440467aaa61fae3a7ddcf5002dfb3ae75b58eaf3c
+DIST cudagdb_2.2_linux_64_rhel5.3.run 1336512 RMD160 71492aef7db31dafc8b95d6c073d123ca59b15b4 SHA1 254f9b78808a357077bfba199827aa85ec622453 SHA256 c86ad34018a128e1e2abf3d818c3e01bce3cfe8e53c88b221a45ff5cc877cf7c
 DIST cudatoolkit_2.1_linux32_suse11.0.run 21309180 RMD160 d026b0ecbca2f8b53d2d69b53b8548e1a5a0d666 SHA1 2df0fdd256ea1dd42f7b4f455a13bd60cc21a00a SHA256 c13b3ba9628c888228c9b841d4944103de972f19ca7cf26a75d66e48632323cf
 DIST cudatoolkit_2.1_linux64_suse11.0.run 22239014 RMD160 181fbed80fd71b5064baff050c182146f1cd7c67 SHA1 55339726ef1df054682c30e6a0b9ad8d8ddfb452 SHA256 71cb1d040cd88e23183477d6ce193af70d952ca5e24c012075e1b78896e4e311
 DIST cudatoolkit_2.2_linux_32_suse11.1.run 28234843 RMD160 50cd85effc3188ee8362235d6e41a5b5f26b7b8f SHA1 f5d44651f86b39d70bbdc35d48095f2c206d859f SHA256 4403d7e2b552b651d4bef2df9feb16b6624b93d7260833c1cd1e1803266382fe
@@ -11,13 +13,14 @@ DIST cudatoolkit_2.2_linux_64_suse11.1.run 29640032 RMD160 8288a864304757847e5ec
 EBUILD nvidia-cuda-toolkit-2.0.ebuild 1615 RMD160 b61ecb10eaae317d72e63b961f59903c7f9f12c2 SHA1 8a4f1729d0d54b64a653206b483c67ccdbfcfad6 SHA256 e211a0908ad6721867f59fa95b96d950a21738869fcfd6e43ee72c9cedc6e327
 EBUILD nvidia-cuda-toolkit-2.1.ebuild 1708 RMD160 310a568cf25b0fd171f55c5b9a7a5c32eb5ad994 SHA1 ad205269eec4d4a49e4343dc95139e89b35384d9 SHA256 faca233fb1464c5ce6053a4fd44af657215189d7a0ac4e728884bc2b8f8dede1
 EBUILD nvidia-cuda-toolkit-2.2-r1.ebuild 2644 RMD160 dbe9a6f046aafc08ff33d8b9b5e49597975e371e SHA1 1c943f9af9660962fb5b96d0c1217d9495939791 SHA256 419ce811b7003f44d91b2c6cc0554b1ffa1c853512bc54ec4fc2ca4f98a2a59f
+EBUILD nvidia-cuda-toolkit-2.2-r2.ebuild 2863 RMD160 9cc59a74e55294f54975e2c2990e55b742a066fb SHA1 65a191593aa0aab14374afceac8e5e98a6499945 SHA256 2f53d0ef51d7a87f51baa91c6d16555fe7ce759439d6b338b33c81b20592a617
 EBUILD nvidia-cuda-toolkit-2.2.ebuild 1741 RMD160 cb7a54b18f3480e9d6851f816befa0a489e81e33 SHA1 f2e214414c3b98053c9b4157c4ba9f0e62821f7c SHA256 a7565064e53b9cb18aa15bad3a189ece913fafdd170a2f05353650b934b8887b
-MISC ChangeLog 1541 RMD160 28eb369a8fa327fe69d729b2bee48376440ea520 SHA1 ed22d2f64dcdd2e0ab632111c5ee58b83a2d779b SHA256 358da8c14a35638f8763d991d0454e78064a2bd29006daa03dcd993504bd08f0
-MISC metadata.xml 355 RMD160 61a9a4dc51bce1060798e97b65a0994791f18536 SHA1 abf0f34bfed6dd1885ea7455d278c1a51a8445fa SHA256 7156b57a062096801a6610f46f0b7acdc2f65e5bf9b283a323e81b184edfb4f7
+MISC ChangeLog 1742 RMD160 6999cfefc999263ee8a43502125a67a055aaeeb4 SHA1 fe746fb015cc19035a0fb37e96ed2332a4a53c1f SHA256 fb9723f2ef319a56b42269bc5f2aec0954b5d593f9c220c189159b57fe7b5090
+MISC metadata.xml 421 RMD160 14a7cc955bb561664165d12762f16e8359de799a SHA1 0a11779a8c23235b3b41b36850a24d29f1bcc18a SHA256 65612620b1e6a2a3094b5999da92e493edcc91e1817ddaa73317a0e4972e60d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkpQT4gACgkQchej4aZK9/deQgCcC+/brwfIby+eJdkbFqBTgsYV
-ft0AnRjK7YfQ3n9EO+XG2yqxnaFSnJwh
-=2YKc
+iEYEARECAAYFAkpQ9dMACgkQchej4aZK9/fiaACdHRbNTOPJ3geKZRJI6bE7PaQZ
+rcEAn2psytLdJiqUK/ga8orE3/T1Tu0B
+=BfOK
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 54cc6b7049e4..25ec5c4b9e59 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -10,6 +10,9 @@
 		<flag name='profiler'>
 			Installs the NVIDIA CUDA visual profiler.
 		</flag>
+		<flag name='debugger'>
+			Installs the CUDA debugger.
+		</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r2.ebuild
new file mode 100644
index 000000000000..d4e679b7b3a2
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r2.ebuild
@@ -0,0 +1,132 @@
+# 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-toolkit/nvidia-cuda-toolkit-2.2-r2.ebuild,v 1.1 2009/07/05 18:49:42 spock Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="NVIDIA CUDA Toolkit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+
+CUDA_V=${PV//./_}
+
+BASE_URI="http://developer.download.nvidia.com/compute/cuda/${CUDA_V}/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${PV}_linux_64_suse11.1.run
+		debugger? ( ${BASE_URI}/cudagdb_2.2_linux_64_rhel5.3.run ) )
+	x86? ( ${BASE_URI}/cudatoolkit_${PV}_linux_32_suse11.1.run
+		debugger? ( ${BASE_URI}/cudagdb_2.2_linux_32_rhel5.3.run ) )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger doc profiler"
+
+DEPEND="!dev-util/nvidia-cuda-profiler"
+RDEPEND="${DEPEND}
+	profiler? ( x86? (
+		x11-libs/qt-gui
+		x11-libs/qt-core
+		x11-libs/qt-assistant
+		x11-libs/qt-sql[sqlite] )
+	)
+	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )"
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	for f in ${A} ; do
+		unpack_makeself ${f}
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-enum_fix.patch"
+}
+
+src_install() {
+	local DEST=/opt/cuda
+	export CONF_LIBDIR_OVERRIDE="lib"
+
+	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
+	export LIBDIR_amd64="lib"
+
+	into ${DEST}
+	dobin bin/*
+	dolib lib/*
+
+	chmod a-x "${D}/${DEST}/bin/nvcc.profile"
+
+	# doman does not respect DESTTREE
+	insinto ${DEST}/man/man1
+	doins man/man1/*
+	insinto ${DEST}/man/man3
+	doins man/man3/*
+	prepman ${DEST}
+
+	insinto ${DEST}/include
+	doins include/*.h
+	insinto ${DEST}/include/crt
+	doins include/crt/*.h
+
+	insinto ${DEST}/src
+	doins src/*
+
+	into ${DEST}/open64
+	dobin open64/bin/*
+	libopts -m0755
+	dolib open64/lib/*
+
+	if use doc ; then
+		insinto ${DEST}/doc
+		doins -r doc/*
+	fi
+
+	cat > "${T}/env" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/lib
+MANPATH=${DEST}/man
+EOF
+	newenvd "${T}/env" 99cuda
+
+	if use profiler; then
+		into ${DEST}/cudaprof
+		dobin cudaprof/bin/cudaprof
+
+		cat > "${T}/env" << EOF
+PATH=${DEST}/cudaprof/bin
+ROOTPATH=${DEST}/cudaprof/bin
+EOF
+		if use x86 ; then
+			dosym /usr/bin/assistant ${DEST}/cudaprof/bin
+		else
+			dobin cudaprof/bin/assistant
+			insinto ${DEST}/cudaprof/bin
+			doins cudaprof/bin/*.so*
+			insinto ${DEST}/cudaprof/bin/sqldrivers
+			doins cudaprof/bin/sqldrivers/*
+
+			cat >> "${T}/env" << EOF
+LDPATH=${DEST}/cudaprof/bin
+EOF
+		fi
+
+		newenvd "${T}/env" 99cudaprof
+
+		if use doc; then
+			insinto ${DEST}/cudaprof/doc
+			doins cudaprof/doc/*
+			insinto ${DEST}/cudaprof/projects
+			doins cudaprof/projects/*
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "If you want to natively run the code generated by CUDA, you will need"
+	elog ">=x11-drivers/nvidia-drivers-185.18.08."
+	elog ""
+	elog "Run '. /etc/profile' before using the CUDA toolkit. "
+}