* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2012-11-26 22:02 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2012-11-26 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 4e50e440c57261c40a6e100d3c9953c3aa094005
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 15:45:40 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 14:41:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4e50e440
dev-util/nvidia-cuda-toolkit: Enhancing cuda-config
Package-Manager: portage-2.2.0_alpha142
---
dev-util/nvidia-cuda-toolkit/ChangeLog | 3 +++
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index fe4ddc0..16f1d05 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
+ 16 Nov 2012; Justin Lecher <jlec@gentoo.org> files/cuda-config.in:
+ Enhancing cuda-config
+
15 Nov 2012; Justin Lecher <jlec@gentoo.org>
nvidia-cuda-toolkit-5.0.35.ebuild, -nvidia-cuda-toolkit-5.0.35-r1.ebuild,
metadata.xml:
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
index 02e7a6f..ca0d1d7 100644
--- a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@@ -1,5 +1,7 @@
#!/bin/bash
+SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
+
_print_help() {
cat <<- EOF
Usage:
@@ -12,12 +14,15 @@ _print_help() {
case ${1} in
-s|--supported)
- echo "CUDA_SUPPORTED_GCC"
+ echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
+ exit 0
;;
-h|--help)
_print_help
+ exit -1
;;
*)
_print_help
+ exit 1
;;
esac
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2013-01-15 15:27 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2013-01-15 15:27 UTC (permalink / raw
To: gentoo-commits
commit: c1ffcdccfbb6219099d45e7140f6e447d9db69dc
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 07:48:12 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 07:48:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c1ffcdcc
inCvs
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
dev-util/nvidia-cuda-toolkit/ChangeLog | 313 --------------------
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 --
dev-util/nvidia-cuda-toolkit/metadata.xml | 16 -
.../nvidia-cuda-toolkit-4.2.9-r1.ebuild | 106 -------
.../nvidia-cuda-toolkit-5.0.35.ebuild | 111 -------
5 files changed, 0 insertions(+), 574 deletions(-)
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
deleted file mode 100644
index 8bdd993..0000000
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ /dev/null
@@ -1,313 +0,0 @@
-# ChangeLog for dev-util/nvidia-cuda-toolkit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
-
- 25 Nov 2012; Justin Lecher <jlec@gentoo.org>
- nvidia-cuda-toolkit-4.2.9-r1.ebuild, nvidia-cuda-toolkit-5.0.35.ebuild:
- Merge change in both versions; fix whitespace error
-
- 16 Nov 2012; Justin Lecher <jlec@gentoo.org> files/cuda-config.in:
- Enhancing cuda-config
-
- 15 Nov 2012; Justin Lecher <jlec@gentoo.org>
- nvidia-cuda-toolkit-5.0.35.ebuild, -nvidia-cuda-toolkit-5.0.35-r1.ebuild,
- metadata.xml:
- Version Bump
-
-*nvidia-cuda-toolkit-4.2.9-r1 (15 Nov 2012)
-
- 15 Nov 2012; Justin Lecher <jlec@gentoo.org>
- -nvidia-cuda-toolkit-4.2.9.ebuild, +nvidia-cuda-toolkit-4.2.9-r1.ebuild,
- +files/cuda-config.in, metadata.xml:
- Use cuda.eclass; install cuda-config; install doc and html into system path
- to support portages file filter
-
-*nvidia-cuda-toolkit-4.2.9 (04 Jul 2012)
-
- 04 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
- -nvidia-cuda-toolkit-4.2.ebuild, +nvidia-cuda-toolkit-4.2.9.ebuild,
- metadata.xml:
- Rewrote ebuild. Use system JRE, try to complies with upstream installation,
- simplified maintenance, add a warning for too new gcc versions
-
- 04 Jul 2012; Justin Lecher <jlec@gentoo.org> nvidia-cuda-toolkit-4.2.ebuild,
- metadata.xml:
- This package is prebuilt so we are using QA_PREBUILT for everything
-
- 03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
- nvidia-cuda-toolkit-4.2.ebuild:
- Fix for amd64-linux prefix which uses lib instead of lib64
-
- 03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
- nvidia-cuda-toolkit-4.2.ebuild:
- More prefix fixes
-
-*nvidia-cuda-toolkit-4.2 (03 Jul 2012)
-
- 03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
- +nvidia-cuda-toolkit-4.2.ebuild, +metadata.xml:
- Version bumped. Switched to EAPI4, added prefix love, cleaned ebuild,
- metadata love
-
- 21 Feb 2012; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.2.ebuild:
- Restore 3.2, which is a dependency of dev-util/nvidia-cuda-npp-3.2.
-
- 21 Feb 2012; Michał Januszewski <spock@gentoo.org>
- -nvidia-cuda-toolkit-2.2-r3.ebuild,
- -files/nvidia-cuda-toolkit-2.2-enum_fix.patch,
- -nvidia-cuda-toolkit-2.3.ebuild, -nvidia-cuda-toolkit-3.0.ebuild,
- -files/nvidia-cuda-toolkit-3.0-enum_fix.patch,
- -nvidia-cuda-toolkit-3.1.ebuild,
- -files/nvidia-cuda-toolkit-3.1-enum_fix.patch,
- -nvidia-cuda-toolkit-3.2.ebuild:
- Remove old ebuilds.
-
- 21 Feb 2012; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
- nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild,
- nvidia-cuda-toolkit-4.1.ebuild:
- Stop creating the /usr/include/CL symlink now that there is an eselect module
- to switch between OpenCL implementations.
-
- 11 Feb 2012; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
- nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild,
- nvidia-cuda-toolkit-4.1.ebuild:
- Do not call env-update in pkg_postinst.
-
- 05 Feb 2012; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-4.1.ebuild:
- Add a dep on gcc-4.5+.
-
- 05 Feb 2012; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-4.1.ebuild:
- Fix problems with the executable bit being unset on some .so files (bug
- #401447).
-
- 05 Feb 2012; Mike Frysinger <vapier@gentoo.org>
- nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
- nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
- nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild,
- nvidia-cuda-toolkit-4.1.ebuild:
- Move to new unpacker eclass for unpack_makeself.
-
-*nvidia-cuda-toolkit-4.1 (29 Jan 2012)
-
- 29 Jan 2012; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-4.1.ebuild:
- Version bump.
-
- 04 Sep 2011; Markus Meier <maekke@gentoo.org> nvidia-cuda-toolkit-4.0.ebuild:
- x86 stable, bug #378545
-
- 27 Aug 2011; Tony Vroon <chainsaw@gentoo.org> nvidia-cuda-toolkit-4.0.ebuild:
- Marked stable on AMD64 based on arch testing by Elijah El Lazkani & Tomáš
- "Mepho" Pružina in bug #378545 filed by Agostino "ago" Sarubbo.
-
- 27 Aug 2011; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-4.0.ebuild:
- Fix bug #380425.
-
- 23 Aug 2011; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-4.0.ebuild:
- Fix bugs #375295, #375801.
-
- 23 Jul 2011; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
- nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
- nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild:
- Remove block on nvidia-cuda-profiler (now removed from the tree).
-
- 12 Jun 2011; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-4.0.ebuild:
- Update the nvidia-drivers dependency for CUDA 4.0 to req. at least 270.41+.
-
-*nvidia-cuda-toolkit-4.0 (29 May 2011)
-
- 29 May 2011; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-4.0.ebuild:
- Add CUDA Toolkit v4.0 (bug #367529).
-
- 06 Jan 2011; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.2.ebuild:
- Block old NVIDIA drivers to prevent collision in /usr/include/CL (bug
- #348920).
-
- 12 Dec 2010; Michał Januszewski <spock@gentoo.org>
- -nvidia-cuda-toolkit-3.0_beta1.ebuild:
- Remove the ebuild for 3.0-beta1.
-
- 12 Dec 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
- nvidia-cuda-toolkit-3.2.ebuild:
- Install a /usr/include/CL symlink for the NVIDIA OpenCL headers.
-
-*nvidia-cuda-toolkit-3.2 (01 Dec 2010)
-
- 01 Dec 2010; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.2.ebuild:
- Version bump.
-
- 06 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
- nvidia-cuda-toolkit-3.1.ebuild:
- Fix libpng SLOT depend wrt #339796 by "MaratIK".
-
- 23 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
- nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
- nvidia-cuda-toolkit-3.0_beta1.ebuild, nvidia-cuda-toolkit-3.0.ebuild,
- nvidia-cuda-toolkit-3.1.ebuild:
- Remove wrong restrictions. Use the proper QA_* variables, not blanket
- restrictions.
-
- 05 Jul 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild:
- Add env-update calls so that the CUDA libraries are picked up by other
- ebuilds and apps (bug #320853).
-
-*nvidia-cuda-toolkit-3.1 (03 Jul 2010)
-
- 03 Jul 2010; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.1.ebuild,
- +files/nvidia-cuda-toolkit-3.1-enum_fix.patch:
- Version bump (bug #325831). Thanks to Clemens Rabe for the updated ebuild.
-
- 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild:
- Add desktop entries for cudaprof and openclprof (no icons so far, as
- NVIDIA does not provide any) (bug #323995).
-
- 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
- -nvidia-cuda-toolkit-2.0.ebuild, -nvidia-cuda-toolkit-2.1.ebuild,
- -nvidia-cuda-toolkit-2.2-r2.ebuild:
- Remove old ebuilds.
-
- 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild:
- Add a missing dependency on libpng-1.2 (bug #323985).
-
- 23 May 2010; Pacho Ramos <pacho@gentoo.org>
- nvidia-cuda-toolkit-2.3.ebuild:
- stable amd64, bug 313067
-
- 10 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- nvidia-cuda-toolkit-2.3.ebuild:
- x86 stable wrt bug #313067
-
- 01 Apr 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild,
- +files/nvidia-cuda-toolkit-3.0-enum_fix.patch:
- Add an enum fix for gcc pedantic mode (bug #311657), fix a typo in
- src_install.
-
- 25 Mar 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild:
- Add a dep on >=sys-devel/binutils-2.20 (bug #279523).
-
-*nvidia-cuda-toolkit-3.0 (21 Mar 2010)
-
- 21 Mar 2010; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.0.ebuild, metadata.xml:
- Version bump.
-
- 20 Jan 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0_beta1.ebuild:
- Update the info about the required version of nvidia-drivers (bug
- #301101).
-
-*nvidia-cuda-toolkit-3.0_beta1 (08 Jan 2010)
-
- 08 Jan 2010; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.0_beta1.ebuild:
- Version bump (bug #298914).
-
- 01 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
- nvidia-cuda-toolkit-2.2-r2.ebuild:
- stable x86, bug 293641
-
- 25 Sep 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.1.ebuild:
- Add a note that 2.1 should never become stable.
-
-*nvidia-cuda-toolkit-2.2-r3 (09 Aug 2009)
-
- 09 Aug 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.2-r3.ebuild:
- Use older binaries to maintain compatiblity with gcc3 (bug #279523).
-
- 09 Aug 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.3.ebuild:
- Add a dep on gcc4 (required for ABI compatibility).
-
- 07 Aug 2009; <chainsaw@gentoo.org> nvidia-cuda-toolkit-2.0.ebuild:
- Marked stable as requested by Michal "Spock" Januszewski
- <spock@gentoo.org> in bug #276538. Arch-tested by Víctor "VQuicksilver"
- Enríquez using K3d & cuda-profiler.
-
- 29 Jul 2009; Michał Januszewski <spock@gentoo.org>
- -nvidia-cuda-toolkit-2.2.ebuild, -nvidia-cuda-toolkit-2.2-r1.ebuild:
- Remove old ebuilds.
-
-*nvidia-cuda-toolkit-2.3 (29 Jul 2009)
-
- 29 Jul 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.3.ebuild:
- Version bump.
-
- 19 Jul 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.0.ebuild, nvidia-cuda-toolkit-2.1.ebuild,
- nvidia-cuda-toolkit-2.2.ebuild, nvidia-cuda-toolkit-2.2-r1.ebuild,
- nvidia-cuda-toolkit-2.2-r2.ebuild:
- Add a warning about gcc-4.4 not being supported by the NVIDIA CUDA
- compiler (bug #278210)
-
- 08 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
- nvidia-cuda-toolkit-2.0.ebuild:
- stable x86, bug 276538
-
-*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:
- Use system Qt4 libraries on x86. Restrict binchecks as this is a binary
- package.
-
-*nvidia-cuda-toolkit-2.2-r1 (19 Jun 2009)
-
- 19 Jun 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.2-r1.ebuild,
- +files/nvidia-cuda-toolkit-2.2-enum_fix.patch, metadata.xml:
- Add support for the CUDA visual profiler (bug #274095).
-
-*nvidia-cuda-toolkit-2.2 (16 May 2009)
-
- 16 May 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.2.ebuild:
- Version bump (bug #269894).
-
- 06 May 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.1.ebuild:
- Add a temporary workaround for bug #266069.
-
- 13 Apr 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.1.ebuild:
- Properly override the lib directory (bug #265722, patch by Georgi
- Georgiev).
-
-*nvidia-cuda-toolkit-2.1 (21 Jan 2009)
-
- 21 Jan 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.1.ebuild:
- Version bump (bug #255128).
-
-*nvidia-cuda-toolkit-2.0 (18 Oct 2008)
-
- 18 Oct 2008; Michał Januszewski <spock@gentoo.org> +metadata.xml,
- +nvidia-cuda-toolkit-2.0.ebuild:
- Initial commit. Thanks to everyone participating in bug #167685 for the
- previous versions of the ebuild.
-
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
deleted file mode 100644
index ca0d1d7..0000000
--- a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
-
-_print_help() {
- cat <<- EOF
- Usage:
- $(basename $0) [options]
-
- -s | --supported Returns by current CUDA supported gcc versions
- -h | --help Shows this help
- EOF
-}
-
-case ${1} in
- -s|--supported)
- echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
- exit 0
- ;;
- -h|--help)
- _print_help
- exit -1
- ;;
- *)
- _print_help
- exit 1
- ;;
-esac
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
deleted file mode 100644
index 6e47b66..0000000
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">
- The NVIDIA® CUDA® Toolkit provides a development environment for C
- and C++ developers building GPU-accelerated applications. The CUDA
- Toolkit includes a compiler for NVIDIA GPUs, math libraries, and
- tools for debugging and optimizing the performance of applications.
-</longdescription>
- <use>
- <flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
- <flag name="debugger">Installs the NVIDIA CUDA debugger</flag>
- <flag name="eclipse">Installs the Eclipse SDK plugin</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild
deleted file mode 100644
index 5c304e5..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cuda unpacker
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-DISTRO=ubuntu11.04
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/toolkit"
-SRC_URI="
- amd64? ( ${CURI}/cudatoolkit_${PV}_linux_64_${DISTRO}.run )
- x86? ( ${CURI}/cudatoolkit_${PV}_linux_32_${DISTRO}.run )"
-
-SLOT="0"
-LICENSE="NVIDIA"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
- || (
- sys-devel/gcc:4.4
- sys-devel/gcc:4.5
- sys-devel/gcc:4.6
- )
- !<=x11-drivers/nvidia-drivers-270.41
- debugger? ( sys-libs/libtermcap-compat )
- 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_prepare() {
- local cuda_supported_gcc
-
- cuda_supported_gcc="4.4 4.5 4.6"
-
- sed \
- -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
- "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
- find cuda-installer.pl install-linux.pl libnvvp/jre run_files -delete || die
-}
-
-src_install() {
- local cudadir=/opt/cuda
- local ecudadir="${EPREFIX}"${cudadir}
-
- if use doc; then
- dodoc doc/*{txt,pdf}
- dohtml -r doc/html/*
- fi
-
- find doc -delete || die
-
- use debugger || rm -r bin/cuda-gdb extras/Debugger
- use eclipse || find libnsight -delete
-
- if use profiler; then
- # hack found in install-linux.pl
- cat > bin/nvvp <<- EOF
- #!${EPREFIX}bin/sh
- LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
- UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/nvvp
- EOF
- chmod a+x bin/nvvp
- else
- rm -r extras/CUPTI libnvvp
- fi
-
- 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
-
- dobin "${T}"/cuda-config
-}
-
-pkg_postinst() {
- local a
- a="$(version_sort $(cuda-config -s))"; a=($a)
- if [[ $(tc-getCC) == *gcc* ]] && \
- version_is_at_least "$(gcc-version)" ${a[1]}; then
- ewarn "gcc >= ${a[1]} 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 "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}"
- ewarn "to the nvcc compiler flags"
- fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
deleted file mode 100644
index a17f442..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cuda unpacker
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-DISTRO=fedora16-1
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel-update-1/installers/"
-SRC_URI="
- amd64? ( ${CURI}/cuda_${PV}_linux_64_${DISTRO}.run )
- x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
-
-SLOT="0"
-LICENSE="NVIDIA"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
- || (
- sys-devel/gcc:4.4
- sys-devel/gcc:4.5
- sys-devel/gcc:4.6
- )
- !<=x11-drivers/nvidia-drivers-270.41
- debugger? ( sys-libs/libtermcap-compat )
- 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/cudatoolkit*run
-}
-
-src_prepare() {
- local cuda_supported_gcc
-
- cuda_supported_gcc="4.4 4.5 4.6"
-
- sed \
- -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
- "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
- find cuda-installer.pl install-linux.pl jre run_files -delete || die
-}
-
-src_install() {
- local cudadir=/opt/cuda
- local ecudadir="${EPREFIX}"${cudadir}
-
- if use doc; then
- dodoc doc/{*.txt,pdf/*}
- dohtml -r doc/html/*
- fi
-
- find doc -delete || die
-
- use debugger || rm -r bin/cuda-gdb extras/Debugger
- use eclipse || find libnsight -delete
-
- if use profiler; then
- # hack found in install-linux.pl
- cat > bin/nvvp <<- EOF
- #!${EPREFIX}bin/sh
- LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
- UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/nvvp
- EOF
- chmod a+x bin/nvvp
- else
- rm -r extras/CUPTI libnvvp
- fi
-
- 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
-
- dobin "${T}"/cuda-config
-}
-
-pkg_postinst() {
- local a
- a="$(version_sort $(cuda-config -s))"; a=($a)
- if [[ $(tc-getCC) == *gcc* ]] && \
- version_is_at_least "$(gcc-version)" ${a[1]}; then
- ewarn "gcc >= ${a[1]} 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 "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}"
- ewarn "to the nvcc compiler flags"
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2013-05-31 15:31 Nicolas Bock
0 siblings, 0 replies; 9+ messages in thread
From: Nicolas Bock @ 2013-05-31 15:31 UTC (permalink / raw
To: gentoo-commits
commit: 6aa523e5bee13e1083cae228d88ded14fd04e787
Author: Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Fri May 31 11:35:33 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri May 31 11:35:33 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6aa523e5
added cuda toolkit 5.5
---
dev-util/nvidia-cuda-toolkit/ChangeLog | 186 +++++++++++++++++++++
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 ++++
.../files/nvidia-cuda-toolkit-2.2-enum_fix.patch | 42 +++++
.../files/nvidia-cuda-toolkit-3.0-enum_fix.patch | 54 ++++++
.../files/nvidia-cuda-toolkit-3.1-enum_fix.patch | 24 +++
dev-util/nvidia-cuda-toolkit/metadata.xml | 19 +++
.../nvidia-cuda-toolkit-5.5.11.ebuild | 140 ++++++++++++++++
7 files changed, 493 insertions(+)
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
new file mode 100644
index 0000000..5dbb67d
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -0,0 +1,186 @@
+# ChangeLog for dev-util/nvidia-cuda-toolkit
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.35 2011/01/06 22:13:37 spock Exp $
+
+ 06 Jan 2011; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-3.2.ebuild:
+ Block old NVIDIA drivers to prevent collision in /usr/include/CL (bug
+ #348920).
+
+ 12 Dec 2010; Michał Januszewski <spock@gentoo.org>
+ -nvidia-cuda-toolkit-3.0_beta1.ebuild:
+ Remove the ebuild for 3.0-beta1.
+
+ 12 Dec 2010; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
+ nvidia-cuda-toolkit-3.2.ebuild:
+ Install a /usr/include/CL symlink for the NVIDIA OpenCL headers.
+
+*nvidia-cuda-toolkit-3.2 (01 Dec 2010)
+
+ 01 Dec 2010; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-3.2.ebuild:
+ Version bump.
+
+ 06 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+ nvidia-cuda-toolkit-3.1.ebuild:
+ Fix libpng SLOT depend wrt #339796 by "MaratIK".
+
+ 23 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
+ nvidia-cuda-toolkit-3.0_beta1.ebuild, nvidia-cuda-toolkit-3.0.ebuild,
+ nvidia-cuda-toolkit-3.1.ebuild:
+ Remove wrong restrictions. Use the proper QA_* variables, not blanket
+ restrictions.
+
+ 05 Jul 2010; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild:
+ Add env-update calls so that the CUDA libraries are picked up by other
+ ebuilds and apps (bug #320853).
+
+*nvidia-cuda-toolkit-3.1 (03 Jul 2010)
+
+ 03 Jul 2010; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-3.1.ebuild,
+ +files/nvidia-cuda-toolkit-3.1-enum_fix.patch:
+ Version bump (bug #325831). Thanks to Clemens Rabe for the updated ebuild.
+
+ 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-3.0.ebuild:
+ Add desktop entries for cudaprof and openclprof (no icons so far, as
+ NVIDIA does not provide any) (bug #323995).
+
+ 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
+ -nvidia-cuda-toolkit-2.0.ebuild, -nvidia-cuda-toolkit-2.1.ebuild,
+ -nvidia-cuda-toolkit-2.2-r2.ebuild:
+ Remove old ebuilds.
+
+ 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-3.0.ebuild:
+ Add a missing dependency on libpng-1.2 (bug #323985).
+
+ 23 May 2010; Pacho Ramos <pacho@gentoo.org>
+ nvidia-cuda-toolkit-2.3.ebuild:
+ stable amd64, bug 313067
+
+ 10 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ nvidia-cuda-toolkit-2.3.ebuild:
+ x86 stable wrt bug #313067
+
+ 01 Apr 2010; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-3.0.ebuild,
+ +files/nvidia-cuda-toolkit-3.0-enum_fix.patch:
+ Add an enum fix for gcc pedantic mode (bug #311657), fix a typo in
+ src_install.
+
+ 25 Mar 2010; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-3.0.ebuild:
+ Add a dep on >=sys-devel/binutils-2.20 (bug #279523).
+
+*nvidia-cuda-toolkit-3.0 (21 Mar 2010)
+
+ 21 Mar 2010; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-3.0.ebuild, metadata.xml:
+ Version bump.
+
+ 20 Jan 2010; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-3.0_beta1.ebuild:
+ Update the info about the required version of nvidia-drivers (bug
+ #301101).
+
+*nvidia-cuda-toolkit-3.0_beta1 (08 Jan 2010)
+
+ 08 Jan 2010; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-3.0_beta1.ebuild:
+ Version bump (bug #298914).
+
+ 01 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+ nvidia-cuda-toolkit-2.2-r2.ebuild:
+ stable x86, bug 293641
+
+ 25 Sep 2009; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-2.1.ebuild:
+ Add a note that 2.1 should never become stable.
+
+*nvidia-cuda-toolkit-2.2-r3 (09 Aug 2009)
+
+ 09 Aug 2009; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-2.2-r3.ebuild:
+ Use older binaries to maintain compatiblity with gcc3 (bug #279523).
+
+ 09 Aug 2009; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-2.3.ebuild:
+ Add a dep on gcc4 (required for ABI compatibility).
+
+ 07 Aug 2009; <chainsaw@gentoo.org> nvidia-cuda-toolkit-2.0.ebuild:
+ Marked stable as requested by Michal "Spock" Januszewski
+ <spock@gentoo.org> in bug #276538. Arch-tested by Víctor "VQuicksilver"
+ Enríquez using K3d & cuda-profiler.
+
+ 29 Jul 2009; Michał Januszewski <spock@gentoo.org>
+ -nvidia-cuda-toolkit-2.2.ebuild, -nvidia-cuda-toolkit-2.2-r1.ebuild:
+ Remove old ebuilds.
+
+*nvidia-cuda-toolkit-2.3 (29 Jul 2009)
+
+ 29 Jul 2009; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-2.3.ebuild:
+ Version bump.
+
+ 19 Jul 2009; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-2.0.ebuild, nvidia-cuda-toolkit-2.1.ebuild,
+ nvidia-cuda-toolkit-2.2.ebuild, nvidia-cuda-toolkit-2.2-r1.ebuild,
+ nvidia-cuda-toolkit-2.2-r2.ebuild:
+ Add a warning about gcc-4.4 not being supported by the NVIDIA CUDA
+ compiler (bug #278210)
+
+ 08 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+ nvidia-cuda-toolkit-2.0.ebuild:
+ stable x86, bug 276538
+
+*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:
+ Use system Qt4 libraries on x86. Restrict binchecks as this is a binary
+ package.
+
+*nvidia-cuda-toolkit-2.2-r1 (19 Jun 2009)
+
+ 19 Jun 2009; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-2.2-r1.ebuild,
+ +files/nvidia-cuda-toolkit-2.2-enum_fix.patch, metadata.xml:
+ Add support for the CUDA visual profiler (bug #274095).
+
+*nvidia-cuda-toolkit-2.2 (16 May 2009)
+
+ 16 May 2009; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-2.2.ebuild:
+ Version bump (bug #269894).
+
+ 06 May 2009; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-2.1.ebuild:
+ Add a temporary workaround for bug #266069.
+
+ 13 Apr 2009; Michał Januszewski <spock@gentoo.org>
+ nvidia-cuda-toolkit-2.1.ebuild:
+ Properly override the lib directory (bug #265722, patch by Georgi
+ Georgiev).
+
+*nvidia-cuda-toolkit-2.1 (21 Jan 2009)
+
+ 21 Jan 2009; Michał Januszewski <spock@gentoo.org>
+ +nvidia-cuda-toolkit-2.1.ebuild:
+ Version bump (bug #255128).
+
+*nvidia-cuda-toolkit-2.0 (18 Oct 2008)
+
+ 18 Oct 2008; Michał Januszewski <spock@gentoo.org> +metadata.xml,
+ +nvidia-cuda-toolkit-2.0.ebuild:
+ Initial commit. Thanks to everyone participating in bug #167685 for the
+ previous versions of the ebuild.
+
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
new file mode 100644
index 0000000..ca0d1d7
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
+
+_print_help() {
+ cat <<- EOF
+ Usage:
+ $(basename $0) [options]
+
+ -s | --supported Returns by current CUDA supported gcc versions
+ -h | --help Shows this help
+ EOF
+}
+
+case ${1} in
+ -s|--supported)
+ echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
+ exit 0
+ ;;
+ -h|--help)
+ _print_help
+ exit -1
+ ;;
+ *)
+ _print_help
+ exit 1
+ ;;
+esac
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch
new file mode 100644
index 0000000..2155672
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch
@@ -0,0 +1,42 @@
+diff -Naurp cudatoolkit_orig/include/cuda.h cudatoolkit/include/cuda.h
+--- cudatoolkit_orig/include/cuda.h 2009-04-13 10:39:12.000000000 +0200
++++ cudatoolkit/include/cuda.h 2009-05-09 17:28:25.000000000 +0200
+@@ -86,7 +86,7 @@ typedef enum CUctx_flags_enum {
+ CU_CTX_SCHED_MASK = 0x3,
+ CU_CTX_BLOCKING_SYNC = 4, ///< Use blocking synchronization
+ CU_CTX_MAP_HOST = 8, ///< Support mapped pinned allocations
+- CU_CTX_FLAGS_MASK = 0xf,
++ CU_CTX_FLAGS_MASK = 0xf
+ } CUctx_flags;
+
+ /**
+@@ -94,7 +94,7 @@ typedef enum CUctx_flags_enum {
+ */
+ typedef enum CUevent_flags_enum {
+ CU_EVENT_DEFAULT = 0, ///< Default event flag
+- CU_EVENT_BLOCKING_SYNC = 1, ///< Event uses blocking synchronization
++ CU_EVENT_BLOCKING_SYNC = 1 ///< Event uses blocking synchronization
+ } CUevent_flags;
+
+ /**
+@@ -117,7 +117,7 @@ typedef enum CUarray_format_enum {
+ typedef enum CUaddress_mode_enum {
+ CU_TR_ADDRESS_MODE_WRAP = 0, ///< Wrapping address mode
+ CU_TR_ADDRESS_MODE_CLAMP = 1, ///< Clamp to edge address mode
+- CU_TR_ADDRESS_MODE_MIRROR = 2, ///< Mirror address mode
++ CU_TR_ADDRESS_MODE_MIRROR = 2 ///< Mirror address mode
+ } CUaddress_mode;
+
+ /**
+diff -Naurp cudatoolkit_orig/include/driver_types.h cudatoolkit/include/driver_types.h
+--- cudatoolkit_orig/include/driver_types.h 2009-04-13 10:39:06.000000000 +0200
++++ cudatoolkit/include/driver_types.h 2009-05-09 17:31:17.000000000 +0200
+@@ -140,7 +140,7 @@ enum cudaChannelFormatKind
+ cudaChannelFormatKindSigned = 0, ///< Signed channel format
+ cudaChannelFormatKindUnsigned = 1, ///< Unsigned channel format
+ cudaChannelFormatKindFloat = 2, ///< Float channel format
+- cudaChannelFormatKindNone = 3, ///< No channel format
++ cudaChannelFormatKindNone = 3 ///< No channel format
+ };
+
+ /**
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch
new file mode 100644
index 0000000..ce11b49
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch
@@ -0,0 +1,54 @@
+diff -Naur cuda.orig/include/cudaGL.h cuda/include/cudaGL.h
+--- cuda.orig/include/cudaGL.h 2010-03-21 13:19:57.000000000 +0100
++++ cuda/include/cudaGL.h 2010-03-21 13:46:29.000000000 +0100
+@@ -59,7 +59,7 @@
+ typedef enum CUGLmap_flags_enum {
+ CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00,
+ CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,
+- CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,
++ CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
+ } CUGLmap_flags;
+
+ CUresult CUDAAPI cuGLInit(void);
+diff -Naur cuda.orig/include/cuda_gl_interop.h cuda/include/cuda_gl_interop.h
+--- cuda.orig/include/cuda_gl_interop.h 2010-03-21 13:19:57.000000000 +0100
++++ cuda/include/cuda_gl_interop.h 2010-03-21 13:28:07.000000000 +0100
+@@ -82,7 +82,7 @@
+ {
+ cudaGLMapFlagsNone = 0, ///< Default; Assume resource can be read/written
+ cudaGLMapFlagsReadOnly = 1, ///< CUDA kernels will not write to this resource
+- cudaGLMapFlagsWriteDiscard = 2, ///< CUDA kernels will only write to and will not read from this resource
++ cudaGLMapFlagsWriteDiscard = 2 ///< CUDA kernels will only write to and will not read from this resource
+ };
+
+ extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);
+diff -Naur cuda.orig/include/driver_types.h cuda/include/driver_types.h
+--- cuda.orig/include/driver_types.h 2010-03-21 13:19:57.000000000 +0100
++++ cuda/include/driver_types.h 2010-03-21 13:26:09.000000000 +0100
+@@ -244,7 +244,7 @@
+ /*DEVICE_BUILTIN*/
+ enum cudaGraphicsRegisterFlags
+ {
+- cudaGraphicsRegisterFlagsNone = 0, ///< Default
++ cudaGraphicsRegisterFlagsNone = 0 ///< Default
+ };
+
+ /**
+@@ -255,7 +255,7 @@
+ {
+ cudaGraphicsMapFlagsNone = 0, ///< Default; Assume resource can be read/written
+ cudaGraphicsMapFlagsReadOnly = 1, ///< CUDA will not write to this resource
+- cudaGraphicsMapFlagsWriteDiscard = 2, ///< CUDA will only write to and will not read from this resource
++ cudaGraphicsMapFlagsWriteDiscard = 2 ///< CUDA will only write to and will not read from this resource
+ };
+
+ /**
+@@ -268,7 +268,7 @@
+ cudaGraphicsCubeFacePositiveY = 0x02, ///< Positive Y face of cubemap
+ cudaGraphicsCubeFaceNegativeY = 0x03, ///< Negative Y face of cubemap
+ cudaGraphicsCubeFacePositiveZ = 0x04, ///< Positive Z face of cubemap
+- cudaGraphicsCubeFaceNegativeZ = 0x05, ///< Negative Z face of cubemap
++ cudaGraphicsCubeFaceNegativeZ = 0x05 ///< Negative Z face of cubemap
+ };
+
+ /**
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch
new file mode 100644
index 0000000..698d2c7
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch
@@ -0,0 +1,24 @@
+diff -Naur include.orig/cudaGL.h include/cudaGL.h
+--- include.orig/cudaGL.h 2010-04-28 09:31:16.000000000 +0200
++++ include/cudaGL.h 2010-05-21 00:04:47.000000000 +0200
+@@ -59,7 +59,7 @@
+ typedef enum CUGLmap_flags_enum {
+ CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00,
+ CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,
+- CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,
++ CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
+ } CUGLmap_flags;
+
+ CUresult CUDAAPI cuGLInit(void);
+diff -Naur include.orig/cuda_gl_interop.h include/cuda_gl_interop.h
+--- include.orig/cuda_gl_interop.h 2010-04-28 09:30:46.000000000 +0200
++++ include/cuda_gl_interop.h 2010-05-21 00:05:08.000000000 +0200
+@@ -83,7 +83,7 @@
+ {
+ cudaGLMapFlagsNone = 0, ///< Default; Assume resource can be read/written
+ cudaGLMapFlagsReadOnly = 1, ///< CUDA kernels will not write to this resource
+- cudaGLMapFlagsWriteDiscard = 2, ///< CUDA kernels will only write to and will not read from this resource
++ cudaGLMapFlagsWriteDiscard = 2 ///< CUDA kernels will only write to and will not read from this resource
+ };
+
+ extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
new file mode 100644
index 0000000..77d82a5
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>cluster</herd>
+ <maintainer>
+ <email>spock@gentoo.org</email>
+ <name>Michał Januszewski</name>
+ </maintainer>
+ <use>
+ <flag name='profiler'>
+ Installs the NVIDIA CUDA visual profiler.
+ </flag>
+ <flag name="debugger">
+ Installs the CUDA debugger.
+ </flag>
+ <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
+ </use>
+</pkgmetadata>
+
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
new file mode 100644
index 0000000..aab15a1
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
@@ -0,0 +1,140 @@
+# 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 $
+
+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-update-1/installers/"
+SRC_URI=""
+SRC_URI="
+ amd64? ( ${CURI}/cuda-${PV}_linux_64.run )
+ x86? ( ${CURI}/cuda-${PV}-linux_32.run )"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-r1"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc 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_nofetch() {
+ einfo "NVIDIA doesn't provide direct download links yet. If you're a"
+ einfo "registered developer, then please download ${ARCHIVE} from"
+ einfo "https://developer.nvidia.com/rdp/cuda-55-release-candidate-installers"
+}
+
+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.6"
+
+ 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 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 related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2013-08-11 12:19 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2013-08-11 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 303f18e01bd306dd4f92ea96031d56becb13e4b8
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 12:19:14 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 12:19:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=303f18e0
InTree
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
dev-util/nvidia-cuda-toolkit/ChangeLog | 190 ---------------------
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 ---
.../files/nvidia-cuda-toolkit-2.2-enum_fix.patch | 42 -----
.../files/nvidia-cuda-toolkit-3.0-enum_fix.patch | 54 ------
.../files/nvidia-cuda-toolkit-3.1-enum_fix.patch | 24 ---
dev-util/nvidia-cuda-toolkit/metadata.xml | 18 --
.../nvidia-cuda-toolkit-5.5.11.ebuild | 142 ---------------
7 files changed, 498 deletions(-)
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
deleted file mode 100644
index aeeec79..0000000
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ /dev/null
@@ -1,190 +0,0 @@
-# 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.35 2011/01/06 22:13:37 spock Exp $
-
- 31 May 2013; Justin Lecher <jlec@gentoo.org>
- nvidia-cuda-toolkit-5.5.11.ebuild, metadata.xml:
- Restrict fetch
-
- 06 Jan 2011; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.2.ebuild:
- Block old NVIDIA drivers to prevent collision in /usr/include/CL (bug
- #348920).
-
- 12 Dec 2010; Michał Januszewski <spock@gentoo.org>
- -nvidia-cuda-toolkit-3.0_beta1.ebuild:
- Remove the ebuild for 3.0-beta1.
-
- 12 Dec 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
- nvidia-cuda-toolkit-3.2.ebuild:
- Install a /usr/include/CL symlink for the NVIDIA OpenCL headers.
-
-*nvidia-cuda-toolkit-3.2 (01 Dec 2010)
-
- 01 Dec 2010; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.2.ebuild:
- Version bump.
-
- 06 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
- nvidia-cuda-toolkit-3.1.ebuild:
- Fix libpng SLOT depend wrt #339796 by "MaratIK".
-
- 23 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
- nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
- nvidia-cuda-toolkit-3.0_beta1.ebuild, nvidia-cuda-toolkit-3.0.ebuild,
- nvidia-cuda-toolkit-3.1.ebuild:
- Remove wrong restrictions. Use the proper QA_* variables, not blanket
- restrictions.
-
- 05 Jul 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild:
- Add env-update calls so that the CUDA libraries are picked up by other
- ebuilds and apps (bug #320853).
-
-*nvidia-cuda-toolkit-3.1 (03 Jul 2010)
-
- 03 Jul 2010; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.1.ebuild,
- +files/nvidia-cuda-toolkit-3.1-enum_fix.patch:
- Version bump (bug #325831). Thanks to Clemens Rabe for the updated ebuild.
-
- 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild:
- Add desktop entries for cudaprof and openclprof (no icons so far, as
- NVIDIA does not provide any) (bug #323995).
-
- 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
- -nvidia-cuda-toolkit-2.0.ebuild, -nvidia-cuda-toolkit-2.1.ebuild,
- -nvidia-cuda-toolkit-2.2-r2.ebuild:
- Remove old ebuilds.
-
- 24 Jun 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild:
- Add a missing dependency on libpng-1.2 (bug #323985).
-
- 23 May 2010; Pacho Ramos <pacho@gentoo.org>
- nvidia-cuda-toolkit-2.3.ebuild:
- stable amd64, bug 313067
-
- 10 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- nvidia-cuda-toolkit-2.3.ebuild:
- x86 stable wrt bug #313067
-
- 01 Apr 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild,
- +files/nvidia-cuda-toolkit-3.0-enum_fix.patch:
- Add an enum fix for gcc pedantic mode (bug #311657), fix a typo in
- src_install.
-
- 25 Mar 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0.ebuild:
- Add a dep on >=sys-devel/binutils-2.20 (bug #279523).
-
-*nvidia-cuda-toolkit-3.0 (21 Mar 2010)
-
- 21 Mar 2010; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.0.ebuild, metadata.xml:
- Version bump.
-
- 20 Jan 2010; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-3.0_beta1.ebuild:
- Update the info about the required version of nvidia-drivers (bug
- #301101).
-
-*nvidia-cuda-toolkit-3.0_beta1 (08 Jan 2010)
-
- 08 Jan 2010; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-3.0_beta1.ebuild:
- Version bump (bug #298914).
-
- 01 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
- nvidia-cuda-toolkit-2.2-r2.ebuild:
- stable x86, bug 293641
-
- 25 Sep 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.1.ebuild:
- Add a note that 2.1 should never become stable.
-
-*nvidia-cuda-toolkit-2.2-r3 (09 Aug 2009)
-
- 09 Aug 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.2-r3.ebuild:
- Use older binaries to maintain compatiblity with gcc3 (bug #279523).
-
- 09 Aug 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.3.ebuild:
- Add a dep on gcc4 (required for ABI compatibility).
-
- 07 Aug 2009; <chainsaw@gentoo.org> nvidia-cuda-toolkit-2.0.ebuild:
- Marked stable as requested by Michal "Spock" Januszewski
- <spock@gentoo.org> in bug #276538. Arch-tested by Víctor "VQuicksilver"
- Enríquez using K3d & cuda-profiler.
-
- 29 Jul 2009; Michał Januszewski <spock@gentoo.org>
- -nvidia-cuda-toolkit-2.2.ebuild, -nvidia-cuda-toolkit-2.2-r1.ebuild:
- Remove old ebuilds.
-
-*nvidia-cuda-toolkit-2.3 (29 Jul 2009)
-
- 29 Jul 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.3.ebuild:
- Version bump.
-
- 19 Jul 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.0.ebuild, nvidia-cuda-toolkit-2.1.ebuild,
- nvidia-cuda-toolkit-2.2.ebuild, nvidia-cuda-toolkit-2.2-r1.ebuild,
- nvidia-cuda-toolkit-2.2-r2.ebuild:
- Add a warning about gcc-4.4 not being supported by the NVIDIA CUDA
- compiler (bug #278210)
-
- 08 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
- nvidia-cuda-toolkit-2.0.ebuild:
- stable x86, bug 276538
-
-*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:
- Use system Qt4 libraries on x86. Restrict binchecks as this is a binary
- package.
-
-*nvidia-cuda-toolkit-2.2-r1 (19 Jun 2009)
-
- 19 Jun 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.2-r1.ebuild,
- +files/nvidia-cuda-toolkit-2.2-enum_fix.patch, metadata.xml:
- Add support for the CUDA visual profiler (bug #274095).
-
-*nvidia-cuda-toolkit-2.2 (16 May 2009)
-
- 16 May 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.2.ebuild:
- Version bump (bug #269894).
-
- 06 May 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.1.ebuild:
- Add a temporary workaround for bug #266069.
-
- 13 Apr 2009; Michał Januszewski <spock@gentoo.org>
- nvidia-cuda-toolkit-2.1.ebuild:
- Properly override the lib directory (bug #265722, patch by Georgi
- Georgiev).
-
-*nvidia-cuda-toolkit-2.1 (21 Jan 2009)
-
- 21 Jan 2009; Michał Januszewski <spock@gentoo.org>
- +nvidia-cuda-toolkit-2.1.ebuild:
- Version bump (bug #255128).
-
-*nvidia-cuda-toolkit-2.0 (18 Oct 2008)
-
- 18 Oct 2008; Michał Januszewski <spock@gentoo.org> +metadata.xml,
- +nvidia-cuda-toolkit-2.0.ebuild:
- Initial commit. Thanks to everyone participating in bug #167685 for the
- previous versions of the ebuild.
-
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
deleted file mode 100644
index ca0d1d7..0000000
--- a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
-
-_print_help() {
- cat <<- EOF
- Usage:
- $(basename $0) [options]
-
- -s | --supported Returns by current CUDA supported gcc versions
- -h | --help Shows this help
- EOF
-}
-
-case ${1} in
- -s|--supported)
- echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
- exit 0
- ;;
- -h|--help)
- _print_help
- exit -1
- ;;
- *)
- _print_help
- exit 1
- ;;
-esac
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch
deleted file mode 100644
index 2155672..0000000
--- a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naurp cudatoolkit_orig/include/cuda.h cudatoolkit/include/cuda.h
---- cudatoolkit_orig/include/cuda.h 2009-04-13 10:39:12.000000000 +0200
-+++ cudatoolkit/include/cuda.h 2009-05-09 17:28:25.000000000 +0200
-@@ -86,7 +86,7 @@ typedef enum CUctx_flags_enum {
- CU_CTX_SCHED_MASK = 0x3,
- CU_CTX_BLOCKING_SYNC = 4, ///< Use blocking synchronization
- CU_CTX_MAP_HOST = 8, ///< Support mapped pinned allocations
-- CU_CTX_FLAGS_MASK = 0xf,
-+ CU_CTX_FLAGS_MASK = 0xf
- } CUctx_flags;
-
- /**
-@@ -94,7 +94,7 @@ typedef enum CUctx_flags_enum {
- */
- typedef enum CUevent_flags_enum {
- CU_EVENT_DEFAULT = 0, ///< Default event flag
-- CU_EVENT_BLOCKING_SYNC = 1, ///< Event uses blocking synchronization
-+ CU_EVENT_BLOCKING_SYNC = 1 ///< Event uses blocking synchronization
- } CUevent_flags;
-
- /**
-@@ -117,7 +117,7 @@ typedef enum CUarray_format_enum {
- typedef enum CUaddress_mode_enum {
- CU_TR_ADDRESS_MODE_WRAP = 0, ///< Wrapping address mode
- CU_TR_ADDRESS_MODE_CLAMP = 1, ///< Clamp to edge address mode
-- CU_TR_ADDRESS_MODE_MIRROR = 2, ///< Mirror address mode
-+ CU_TR_ADDRESS_MODE_MIRROR = 2 ///< Mirror address mode
- } CUaddress_mode;
-
- /**
-diff -Naurp cudatoolkit_orig/include/driver_types.h cudatoolkit/include/driver_types.h
---- cudatoolkit_orig/include/driver_types.h 2009-04-13 10:39:06.000000000 +0200
-+++ cudatoolkit/include/driver_types.h 2009-05-09 17:31:17.000000000 +0200
-@@ -140,7 +140,7 @@ enum cudaChannelFormatKind
- cudaChannelFormatKindSigned = 0, ///< Signed channel format
- cudaChannelFormatKindUnsigned = 1, ///< Unsigned channel format
- cudaChannelFormatKindFloat = 2, ///< Float channel format
-- cudaChannelFormatKindNone = 3, ///< No channel format
-+ cudaChannelFormatKindNone = 3 ///< No channel format
- };
-
- /**
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch
deleted file mode 100644
index ce11b49..0000000
--- a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur cuda.orig/include/cudaGL.h cuda/include/cudaGL.h
---- cuda.orig/include/cudaGL.h 2010-03-21 13:19:57.000000000 +0100
-+++ cuda/include/cudaGL.h 2010-03-21 13:46:29.000000000 +0100
-@@ -59,7 +59,7 @@
- typedef enum CUGLmap_flags_enum {
- CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00,
- CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,
-- CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,
-+ CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
- } CUGLmap_flags;
-
- CUresult CUDAAPI cuGLInit(void);
-diff -Naur cuda.orig/include/cuda_gl_interop.h cuda/include/cuda_gl_interop.h
---- cuda.orig/include/cuda_gl_interop.h 2010-03-21 13:19:57.000000000 +0100
-+++ cuda/include/cuda_gl_interop.h 2010-03-21 13:28:07.000000000 +0100
-@@ -82,7 +82,7 @@
- {
- cudaGLMapFlagsNone = 0, ///< Default; Assume resource can be read/written
- cudaGLMapFlagsReadOnly = 1, ///< CUDA kernels will not write to this resource
-- cudaGLMapFlagsWriteDiscard = 2, ///< CUDA kernels will only write to and will not read from this resource
-+ cudaGLMapFlagsWriteDiscard = 2 ///< CUDA kernels will only write to and will not read from this resource
- };
-
- extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);
-diff -Naur cuda.orig/include/driver_types.h cuda/include/driver_types.h
---- cuda.orig/include/driver_types.h 2010-03-21 13:19:57.000000000 +0100
-+++ cuda/include/driver_types.h 2010-03-21 13:26:09.000000000 +0100
-@@ -244,7 +244,7 @@
- /*DEVICE_BUILTIN*/
- enum cudaGraphicsRegisterFlags
- {
-- cudaGraphicsRegisterFlagsNone = 0, ///< Default
-+ cudaGraphicsRegisterFlagsNone = 0 ///< Default
- };
-
- /**
-@@ -255,7 +255,7 @@
- {
- cudaGraphicsMapFlagsNone = 0, ///< Default; Assume resource can be read/written
- cudaGraphicsMapFlagsReadOnly = 1, ///< CUDA will not write to this resource
-- cudaGraphicsMapFlagsWriteDiscard = 2, ///< CUDA will only write to and will not read from this resource
-+ cudaGraphicsMapFlagsWriteDiscard = 2 ///< CUDA will only write to and will not read from this resource
- };
-
- /**
-@@ -268,7 +268,7 @@
- cudaGraphicsCubeFacePositiveY = 0x02, ///< Positive Y face of cubemap
- cudaGraphicsCubeFaceNegativeY = 0x03, ///< Negative Y face of cubemap
- cudaGraphicsCubeFacePositiveZ = 0x04, ///< Positive Z face of cubemap
-- cudaGraphicsCubeFaceNegativeZ = 0x05, ///< Negative Z face of cubemap
-+ cudaGraphicsCubeFaceNegativeZ = 0x05 ///< Negative Z face of cubemap
- };
-
- /**
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch
deleted file mode 100644
index 698d2c7..0000000
--- a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur include.orig/cudaGL.h include/cudaGL.h
---- include.orig/cudaGL.h 2010-04-28 09:31:16.000000000 +0200
-+++ include/cudaGL.h 2010-05-21 00:04:47.000000000 +0200
-@@ -59,7 +59,7 @@
- typedef enum CUGLmap_flags_enum {
- CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00,
- CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,
-- CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,
-+ CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
- } CUGLmap_flags;
-
- CUresult CUDAAPI cuGLInit(void);
-diff -Naur include.orig/cuda_gl_interop.h include/cuda_gl_interop.h
---- include.orig/cuda_gl_interop.h 2010-04-28 09:30:46.000000000 +0200
-+++ include/cuda_gl_interop.h 2010-05-21 00:05:08.000000000 +0200
-@@ -83,7 +83,7 @@
- {
- cudaGLMapFlagsNone = 0, ///< Default; Assume resource can be read/written
- cudaGLMapFlagsReadOnly = 1, ///< CUDA kernels will not write to this resource
-- cudaGLMapFlagsWriteDiscard = 2, ///< CUDA kernels will only write to and will not read from this resource
-+ cudaGLMapFlagsWriteDiscard = 2 ///< CUDA kernels will only write to and will not read from this resource
- };
-
- extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
deleted file mode 100644
index 29dfa67..0000000
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>cluster</herd>
- <maintainer>
- <email>spock@gentoo.org</email>
- <name>Michał Januszewski</name>
- </maintainer>
- <use>
- <flag name="profiler">
- Installs the NVIDIA CUDA visual profiler.
- </flag>
- <flag name="debugger">
- Installs the CUDA debugger.
- </flag>
- <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
deleted file mode 100644
index b648be6..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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 $
-
-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-update-1/installers/"
-SRC_URI=""
-SRC_URI="
- amd64? ( ${CURI}/cuda-${PV}_linux_64.run )
- x86? ( ${CURI}/cuda-${PV}-linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-r1"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc 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/*"
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
- einfo "NVIDIA doesn't provide direct download links yet. If you're a"
- einfo "registered developer, then please download ${ARCHIVE} from"
- einfo "https://developer.nvidia.com/rdp/cuda-55-release-candidate-installers"
-}
-
-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.6"
-
- 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 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 related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2014-07-10 8:53 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2014-07-10 8:53 UTC (permalink / raw
To: gentoo-commits
commit: cc6cbe3ca9c8de58c0c868d844c2ee5709554429
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Jul 10 06:25:14 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jul 10 06:25:14 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cc6cbe3c
dev-util/nvidia-cuda-toolkit: dev-util/nvidia-cuda-toolkit: add version 6.5.11
Package-Manager: portage-2.2.8-r1
---
dev-util/nvidia-cuda-toolkit/ChangeLog | 9 ++
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 ++++
dev-util/nvidia-cuda-toolkit/metadata.xml | 14 ++
.../nvidia-cuda-toolkit-6.5.11.ebuild | 152 +++++++++++++++++++++
4 files changed, 203 insertions(+)
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
new file mode 100644
index 0000000..d8307ea
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-util/nvidia-cuda-toolkit
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*nvidia-cuda-toolkit-6.5.11 (10 Jul 2014)
+
+ 10 Jul 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
+ +metadata.xml, +nvidia-cuda-toolkit-6.5.11.ebuild:
+ dev-util/nvidia-cuda-toolkit: dev-util/nvidia-cuda-toolkit: add version 6.5.11
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
new file mode 100644
index 0000000..ca0d1d7
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
+
+_print_help() {
+ cat <<- EOF
+ Usage:
+ $(basename $0) [options]
+
+ -s | --supported Returns by current CUDA supported gcc versions
+ -h | --help Shows this help
+ EOF
+}
+
+case ${1} in
+ -s|--supported)
+ echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
+ exit 0
+ ;;
+ -h|--help)
+ _print_help
+ exit -1
+ ;;
+ *)
+ _print_help
+ exit 1
+ ;;
+esac
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
new file mode 100644
index 0000000..e099ba5
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <use>
+ <flag name="profiler">
+ Installs the NVIDIA CUDA visual profiler.
+ </flag>
+ <flag name="debugger">
+ Installs the CUDA debugger.
+ </flag>
+ <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.11.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.11.ebuild
new file mode 100644
index 0000000..494ee09
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.11.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit check-reqs 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="https://developer.nvidia.com/rdp/cuda-65-rc-toolkit-download"
+SRC_URI="
+ amd64? ( cuda_${PV}_rc_linux_64.run )
+ x86? ( cuda_${PV}_rc_linux_32.run )"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ <sys-devel/gcc-4.9[cxx]
+ >=x11-drivers/nvidia-drivers-340.24[uvm]
+ debugger? (
+ sys-libs/libtermcap-compat
+ sys-libs/ncurses[tinfo]
+ )
+ eclipse? ( >=virtual/jre-1.6 )
+ profiler? ( >=virtual/jre-1.6 )"
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+ einfo "Please download"
+ einfo " - cuda_${P}_rc_linux64.run or"
+ einfo " - cuda_${P}_rc_linux32.run"
+ einfo "from ${CURI} and place it in ${DISTDIR}"
+}
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="1500M"
+
+pkg_setup() {
+ # We don't like to run cuda_pkg_setup as it depends on us
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpacker
+ unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+ local cuda_supported_gcc
+
+ cuda_supported_gcc="4.8"
+
+ 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
+
+ mv doc/man/man3/{,cuda-}deprecated.3 || die
+ doman doc/man/man*/*
+
+ use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+ ( use profiler || use eclipse ) || remove+=" libnsight"
+ use amd64 || remove+=" cuda-installer.pl"
+
+ 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_check() {
+ 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
+}
+
+pkg_postinst() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ pkg_postinst_check
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2014-07-10 8:53 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2014-07-10 8:53 UTC (permalink / raw
To: gentoo-commits
commit: e9d1c234decca24aea25d844e853adec8d98758c
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Jul 10 06:25:14 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jul 10 08:53:32 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e9d1c234
dev-util/nvidia-cuda-toolkit: dev-util/nvidia-cuda-toolkit: add version 6.5.11
Package-Manager: portage-2.2.8-r1
---
dev-util/nvidia-cuda-toolkit/ChangeLog | 9 ++
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 ++++
dev-util/nvidia-cuda-toolkit/metadata.xml | 14 ++
.../nvidia-cuda-toolkit-6.5.11.ebuild | 152 +++++++++++++++++++++
4 files changed, 203 insertions(+)
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
new file mode 100644
index 0000000..d8307ea
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-util/nvidia-cuda-toolkit
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*nvidia-cuda-toolkit-6.5.11 (10 Jul 2014)
+
+ 10 Jul 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
+ +metadata.xml, +nvidia-cuda-toolkit-6.5.11.ebuild:
+ dev-util/nvidia-cuda-toolkit: dev-util/nvidia-cuda-toolkit: add version 6.5.11
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
new file mode 100644
index 0000000..ca0d1d7
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
+
+_print_help() {
+ cat <<- EOF
+ Usage:
+ $(basename $0) [options]
+
+ -s | --supported Returns by current CUDA supported gcc versions
+ -h | --help Shows this help
+ EOF
+}
+
+case ${1} in
+ -s|--supported)
+ echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
+ exit 0
+ ;;
+ -h|--help)
+ _print_help
+ exit -1
+ ;;
+ *)
+ _print_help
+ exit 1
+ ;;
+esac
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
new file mode 100644
index 0000000..e099ba5
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <use>
+ <flag name="profiler">
+ Installs the NVIDIA CUDA visual profiler.
+ </flag>
+ <flag name="debugger">
+ Installs the CUDA debugger.
+ </flag>
+ <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.11.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.11.ebuild
new file mode 100644
index 0000000..494ee09
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.11.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit check-reqs 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="https://developer.nvidia.com/rdp/cuda-65-rc-toolkit-download"
+SRC_URI="
+ amd64? ( cuda_${PV}_rc_linux_64.run )
+ x86? ( cuda_${PV}_rc_linux_32.run )"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ <sys-devel/gcc-4.9[cxx]
+ >=x11-drivers/nvidia-drivers-340.24[uvm]
+ debugger? (
+ sys-libs/libtermcap-compat
+ sys-libs/ncurses[tinfo]
+ )
+ eclipse? ( >=virtual/jre-1.6 )
+ profiler? ( >=virtual/jre-1.6 )"
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+ einfo "Please download"
+ einfo " - cuda_${P}_rc_linux64.run or"
+ einfo " - cuda_${P}_rc_linux32.run"
+ einfo "from ${CURI} and place it in ${DISTDIR}"
+}
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="1500M"
+
+pkg_setup() {
+ # We don't like to run cuda_pkg_setup as it depends on us
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpacker
+ unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+ local cuda_supported_gcc
+
+ cuda_supported_gcc="4.8"
+
+ 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
+
+ mv doc/man/man3/{,cuda-}deprecated.3 || die
+ doman doc/man/man*/*
+
+ use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+ ( use profiler || use eclipse ) || remove+=" libnsight"
+ use amd64 || remove+=" cuda-installer.pl"
+
+ 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_check() {
+ 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
+}
+
+pkg_postinst() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ pkg_postinst_check
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2015-01-18 2:16 Christoph Junghans
0 siblings, 0 replies; 9+ messages in thread
From: Christoph Junghans @ 2015-01-18 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 7b6f38eafd45eada2118c774712fe43c0e4677dc
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jan 14 09:47:13 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 14 09:47:13 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7b6f38ea
dev-util/nvidia-cuda-toolkit: Add 7.0 release candidate
---
dev-util/nvidia-cuda-toolkit/ChangeLog | 6 +
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 ++++
dev-util/nvidia-cuda-toolkit/metadata.xml | 18 +++
.../nvidia-cuda-toolkit-7.0.18.ebuild | 152 +++++++++++++++++++++
4 files changed, 204 insertions(+)
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
new file mode 100644
index 0000000..c46ecef
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -0,0 +1,6 @@
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 14 Jul 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
+ +metadata.xml, +nvidia-cuda-toolkit-7.0.18.ebuild:
+ Add version 7.0.18 (release candidate)
\ No newline at end of file
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
new file mode 100644
index 0000000..ca0d1d7
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
+
+_print_help() {
+ cat <<- EOF
+ Usage:
+ $(basename $0) [options]
+
+ -s | --supported Returns by current CUDA supported gcc versions
+ -h | --help Shows this help
+ EOF
+}
+
+case ${1} in
+ -s|--supported)
+ echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
+ exit 0
+ ;;
+ -h|--help)
+ _print_help
+ exit -1
+ ;;
+ *)
+ _print_help
+ exit 1
+ ;;
+esac
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
new file mode 100644
index 0000000..5e09419
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
+ <use>
+ <flag name="profiler">
+ Installs the NVIDIA CUDA visual profiler.
+ </flag>
+ <flag name="debugger">
+ Installs the CUDA debugger.
+ </flag>
+ <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
new file mode 100644
index 0000000..2fbe00c
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit check-reqs 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="https://developer.nvidia.com/rdp/cuda-70-rc-downloads"
+SRC_URI="cuda_${PV}_rc_linux.run"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ >=sys-devel/gcc-4.7[cxx]
+ >=x11-drivers/nvidia-drivers-340.32[uvm]
+ debugger? (
+ sys-libs/libtermcap-compat
+ sys-libs/ncurses[tinfo]
+ )
+ eclipse? ( >=virtual/jre-1.6 )
+ profiler? ( >=virtual/jre-1.6 )"
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+ einfo "Please download"
+ einfo " - cuda_${P}_rc_linux.run"
+ einfo "from ${CURI} and place it in ${DISTDIR}"
+}
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="1500M"
+
+pkg_setup() {
+ # We don't like to run cuda_pkg_setup as it depends on us
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpacker
+ unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+ local cuda_supported_gcc
+
+ cuda_supported_gcc="4.9"
+
+ 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
+
+ if use amd64; then
+ mv doc/man/man3/{,cuda-}deprecated.3 || die
+ doman doc/man/man*/*
+ fi
+
+ use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+ ( use profiler || use eclipse ) || remove+=" libnsight"
+ use amd64 || remove+=" cuda-installer.pl"
+
+ 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} || die
+
+ cat > "${T}"/99cuda <<- EOF
+ PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
+ ROOTPATH=${ecudadir}/bin
+ LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+ EOF
+ doenvd "${T}"/99cuda
+
+ use profiler && \
+ make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+
+ dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+ 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
+}
+
+pkg_postinst() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ pkg_postinst_check
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2015-07-10 3:59 Nicolas Bock
0 siblings, 0 replies; 9+ messages in thread
From: Nicolas Bock @ 2015-07-10 3:59 UTC (permalink / raw
To: gentoo-commits
commit: 14315c7370fbe13785505e58e6db4ece021557a3
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jul 8 10:18:30 2015 +0000
Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jul 8 10:18:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=14315c73
dev-util/nvidia-cuda-toolkit: Add CUDA 7.5 release candidate
Package-Manager: portage-2.2.18
dev-util/nvidia-cuda-toolkit/ChangeLog | 9 ++
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 ++++
dev-util/nvidia-cuda-toolkit/metadata.xml | 14 ++
.../nvidia-cuda-toolkit-7.5.7.ebuild | 152 +++++++++++++++++++++
4 files changed, 203 insertions(+)
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
new file mode 100644
index 0000000..8ab8f99
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-util/nvidia-cuda-toolkit
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*nvidia-cuda-toolkit-7.5.7 (08 Jul 2015)
+
+ 08 Jul 2015; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
+ +metadata.xml, +nvidia-cuda-toolkit-7.5.7.ebuild:
+ dev-util/nvidia-cuda-toolkit: Add CUDA 7.5 release candidate
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
new file mode 100644
index 0000000..ca0d1d7
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
+
+_print_help() {
+ cat <<- EOF
+ Usage:
+ $(basename $0) [options]
+
+ -s | --supported Returns by current CUDA supported gcc versions
+ -h | --help Shows this help
+ EOF
+}
+
+case ${1} in
+ -s|--supported)
+ echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
+ exit 0
+ ;;
+ -h|--help)
+ _print_help
+ exit -1
+ ;;
+ *)
+ _print_help
+ exit 1
+ ;;
+esac
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
new file mode 100644
index 0000000..e099ba5
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <use>
+ <flag name="profiler">
+ Installs the NVIDIA CUDA visual profiler.
+ </flag>
+ <flag name="debugger">
+ Installs the CUDA debugger.
+ </flag>
+ <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.7.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.7.ebuild
new file mode 100644
index 0000000..f414d60
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.7.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit check-reqs 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="https://developer.nvidia.com/rdp/cuda-75-release-candidate"
+SRC_URI="cuda_${PV}_rc_linux.run"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ >=sys-devel/gcc-4.7[cxx]
+ >=x11-drivers/nvidia-drivers-352.07[uvm]
+ debugger? (
+ sys-libs/libtermcap-compat
+ sys-libs/ncurses[tinfo]
+ )
+ eclipse? ( >=virtual/jre-1.6 )
+ profiler? ( >=virtual/jre-1.6 )"
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+ einfo "Please download the RHEL 7 \"runfile (local)\" installer"
+ einfo " - cuda_${P}_rc_linux.run"
+ einfo "from ${CURI} and place it in ${DISTDIR}"
+}
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="1500M"
+
+pkg_setup() {
+ # We don't like to run cuda_pkg_setup as it depends on us
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpacker
+ unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+ local cuda_supported_gcc
+
+ cuda_supported_gcc="4.7 4.8 4.9"
+
+ 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
+
+ mv doc/man/man3/{,cuda-}deprecated.3 || die
+ doman doc/man/man*/*
+
+ use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+ ( use profiler || use eclipse ) || remove+=" libnsight"
+ remove+=" cuda-installer.pl"
+
+ 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
+
+ ln -sf lib lib32 || die
+
+ dodir ${cudadir}
+ mv * "${ED}"${cudadir} || die
+
+ cat > "${T}"/99cuda <<- EOF
+ PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
+ ROOTPATH=${ecudadir}/bin
+ LDPATH=${ecudadir}/lib64:${ecudadir}/lib
+ EOF
+ doenvd "${T}"/99cuda
+
+ use profiler && \
+ make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib
+
+ dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+ 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
+}
+
+pkg_postinst() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ pkg_postinst_check
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/
@ 2016-05-30 8:52 Marius Brehler
0 siblings, 0 replies; 9+ messages in thread
From: Marius Brehler @ 2016-05-30 8:52 UTC (permalink / raw
To: gentoo-commits
commit: 3e04fe220a83ff6b2d7e68ead0707bc5e0566508
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon May 30 08:46:55 2016 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon May 30 08:46:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3e04fe22
dev-util/nvidia-cuda-toolkit: New CUDA 8 Release Candidate
Package-Manager: portage-2.2.28
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 ++++
dev-util/nvidia-cuda-toolkit/metadata.xml | 17 +++
.../nvidia-cuda-toolkit-8.0.27.ebuild | 153 +++++++++++++++++++++
3 files changed, 198 insertions(+)
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
new file mode 100644
index 0000000..ca0d1d7
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
+
+_print_help() {
+ cat <<- EOF
+ Usage:
+ $(basename $0) [options]
+
+ -s | --supported Returns by current CUDA supported gcc versions
+ -h | --help Shows this help
+ EOF
+}
+
+case ${1} in
+ -s|--supported)
+ echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
+ exit 0
+ ;;
+ -h|--help)
+ _print_help
+ exit -1
+ ;;
+ *)
+ _print_help
+ exit 1
+ ;;
+esac
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
new file mode 100644
index 0000000..ad6a397
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <use>
+ <flag name="profiler">
+ Installs the NVIDIA CUDA visual profiler.
+ </flag>
+ <flag name="debugger">
+ Installs the CUDA debugger.
+ </flag>
+ <flag name="eclipse">Install plugins for eclipse</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild
new file mode 100644
index 0000000..df53170
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit check-reqs cuda unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
+CURI="https://developer.nvidia.com/cuda-release-candidate-download"
+SRC_URI="cuda_${PV}_linux.run"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ >=sys-devel/gcc-4.7[cxx]
+ >=x11-drivers/nvidia-drivers-361.42[uvm]
+ debugger? (
+ sys-libs/libtermcap-compat
+ sys-libs/ncurses[tinfo]
+ )
+ eclipse? ( >=virtual/jre-1.6 )
+ profiler? ( >=virtual/jre-1.6 )"
+RESTRICT="fetch"
+
+pkg_nofetch() {
+ einfo "Please download the RHEL 7 \"runfile (local)\" installer"
+ einfo " - cuda_${P}_rc_linux.run"
+ einfo "from ${CURI} and place it in ${DISTDIR}"
+}
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="1500M"
+
+pkg_setup() {
+ # We don't like to run cuda_pkg_setup as it depends on us
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpacker
+ unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+ local cuda_supported_gcc
+
+ cuda_supported_gcc="4.7 4.8 4.9 5.3"
+
+ sed \
+ -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+ "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+ default
+}
+
+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
+
+ mv doc/man/man3/{,cuda-}deprecated.3 || die
+ doman doc/man/man*/*
+
+ use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+ ( use profiler || use eclipse ) || remove+=" libnsight"
+ remove+=" cuda-installer.pl"
+
+ 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
+
+ ln -sf lib lib32 || die
+
+ dodir ${cudadir}
+ mv * "${ED}"${cudadir} || die
+
+ cat > "${T}"/99cuda <<- EOF
+ PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
+ ROOTPATH=${ecudadir}/bin
+ LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+ EOF
+ doenvd "${T}"/99cuda
+
+ use profiler && \
+ make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib
+
+ dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+ 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
+}
+
+pkg_postinst() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ pkg_postinst_check
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-05-30 8:52 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-10 8:53 [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2016-05-30 8:52 Marius Brehler
2015-07-10 3:59 Nicolas Bock
2015-01-18 2:16 Christoph Junghans
2014-07-10 8:53 Justin Lecher
2013-08-11 12:19 Justin Lecher
2013-05-31 15:31 Nicolas Bock
2013-01-15 15:27 Justin Lecher
2012-11-26 22:02 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox