summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-01-14 07:47:16 +0000
committerJustin Lecher <jlec@gentoo.org>2013-01-14 07:47:16 +0000
commit7d776ecb821fe3edcce5ae0bc2a391f95087ae71 (patch)
tree99d5c02652d1ec5a5660b0df519140b0ec89b86a /dev-util/nvidia-cuda-toolkit
parentapp-misc/gcal: Version Bump, moved to EAPI=5, #451710; fixes also build with ... (diff)
downloadgentoo-2-7d776ecb821fe3edcce5ae0bc2a391f95087ae71.tar.gz
gentoo-2-7d776ecb821fe3edcce5ae0bc2a391f95087ae71.tar.bz2
gentoo-2-7d776ecb821fe3edcce5ae0bc2a391f95087ae71.zip
dev-util/nvidia-cuda-toolkit: Version Bump, #446072 and #451972; fine grad what msg we are showing, #440434; support prefix installations, #405317; drop old, #351702; take the package
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'dev-util/nvidia-cuda-toolkit')
-rw-r--r--dev-util/nvidia-cuda-toolkit/ChangeLog14
-rw-r--r--dev-util/nvidia-cuda-toolkit/files/cuda-config.in28
-rw-r--r--dev-util/nvidia-cuda-toolkit/metadata.xml19
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild141
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild106
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild111
6 files changed, 267 insertions, 152 deletions
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 31bfdec1e3e8..4b5019fa6ae2 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,16 @@
# 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.53 2012/09/24 00:44:31 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.54 2013/01/14 07:47:16 jlec Exp $
+
+*nvidia-cuda-toolkit-5.0.35 (14 Jan 2013)
+*nvidia-cuda-toolkit-4.2.9-r1 (14 Jan 2013)
+
+ 14 Jan 2013; Justin Lecher <jlec@gentoo.org> -nvidia-cuda-toolkit-3.2.ebuild,
+ +nvidia-cuda-toolkit-4.2.9-r1.ebuild, +nvidia-cuda-toolkit-5.0.35.ebuild,
+ +files/cuda-config.in, metadata.xml:
+ Version Bump, #446072 and #451972; fine grad what msg we are showing,
+ #440434; support prefix installations, #405317; drop old, #351702; take the
+ package
24 Sep 2012; Mike Frysinger <vapier@gentoo.org>
nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.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 000000000000..ca0d1d77e107
--- /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
index 676cbf61007c..5e09419f5bfa 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>spock@gentoo.org</email>
- <name>Michał Januszewski</name>
- </maintainer>
- <use>
- <flag name='profiler'>
+ <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'>
+ <flag name="debugger">
Installs the CUDA debugger.
</flag>
- </use>
+ <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-3.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild
deleted file mode 100644
index e6d79e172ea5..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 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-3.2.ebuild,v 1.11 2012/09/24 00:44:31 vapier Exp $
-
-EAPI=2
-
-inherit eutils multilib unpacker
-
-DESCRIPTION="NVIDIA CUDA Toolkit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-RESTRICT="binchecks"
-
-CUDA_V=${PV//_/-}
-DIR_V=${CUDA_V//./_}
-DIR_V=${DIR_V//beta/Beta}
-
-BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}_prod/toolkit"
-SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.16_linux_64_ubuntu10.04.run )
- x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.16_linux_32_ubuntu10.04.run )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debugger doc profiler"
-
-RDEPEND="${DEPEND}
- >=sys-devel/binutils-2.20
- >=sys-devel/gcc-4.0
- profiler? ( x86? (
- x11-libs/qt-gui:4
- x11-libs/qt-core:4
- x11-libs/qt-assistant:4
- x11-libs/qt-sql:4[sqlite] )
- media-libs/libpng:1.2
- )
- debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )
- !<=x11-drivers/nvidia-drivers-256.53"
-
-S="${WORKDIR}"
-
-#QA_FLAGS_IGNORED_x86="opt/cuda/.*"
-#QA_FLAGS_IGNORED_amd64="opt/cuda/.*"
-
-src_install() {
- local DEST=/opt/cuda
-
- into ${DEST}
- dobin bin/*
- dolib $(get_libdir)/*
-
- if ! use debugger; then
- rm -f "${D}/${DEST}/bin/cuda-gdb"
- fi
-
- chmod a-x "${D}/${DEST}/bin/nvcc.profile"
-
- # TODO: Manuals are missing from this release. Remove the following
- # commented-out lines if they are not restored in the next releases.
- # doman does not respect DESTTREE
- #insinto ${DEST}/man/man1
- #doins man/man1/*
- #insinto ${DEST}/man/man3
- #doins man/man3/*
- #prepman ${DEST}
-
- insinto ${DEST}/include
- doins -r include/*
-
- insinto ${DEST}/src
- doins src/*
-
- if use doc ; then
- insinto ${DEST}/doc
- doins -r doc/*
- fi
-
- cat > "${T}/env" << EOF
-PATH=${DEST}/bin
-ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/$(get_libdir)
-MANPATH=${DEST}/man
-EOF
- newenvd "${T}/env" 99cuda
-
- if use profiler; then
- local target="computeprof"
-
- into ${DEST}/${target}
- dobin ${target}/bin/${target}
-
- cat > "${T}/env" << EOF
-PATH=${DEST}/${target}/bin
-ROOTPATH=${DEST}/${target}/bin
-EOF
- if use x86 ; then
- dosym /usr/bin/assistant ${DEST}/${target}/bin
-
- insinto ${DEST}/${target}/bin
- doins ${target}/bin/cudaapitrace.so
- else
- dobin ${target}/bin/assistant
- insinto ${DEST}/${target}/bin
- doins ${target}/bin/*.so*
- insinto ${DEST}/${target}/bin/sqldrivers
- doins ${target}/bin/sqldrivers/*
-
- cat >> "${T}/env" << EOF
-LDPATH=${DEST}/${target}/bin
-EOF
- fi
-
- newenvd "${T}/env" 99${target}
-
- if use doc; then
- insinto ${DEST}/${target}
- doins ${target}/*.txt
- insinto ${DEST}/${target}/doc
- doins ${target}/doc/*
- insinto ${DEST}/${target}/projects
- doins ${target}/projects/*
- fi
-
- make_desktop_entry /opt/cuda/computeprof/bin/computeprof "NVIDIA Compute Visual Profiler"
- fi
-
- export CONF_LIBDIR_OVERRIDE="lib"
- # HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
- export LIBDIR_amd64="lib"
-
- into ${DEST}/open64
- dobin open64/bin/*
- libopts -m0755
- dolib open64/lib/*
-}
-
-pkg_postinst() {
- elog "If you want to natively run the code generated by this version of the"
- elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-260.19.21."
- elog ""
- elog "Run '. /etc/profile' before using the CUDA toolkit. "
-}
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
new file mode 100644
index 000000000000..713420ae4733
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild,v 1.1 2013/01/14 07:47:16 jlec Exp $
+
+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
new file mode 100644
index 000000000000..9b1edbc9fde2
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
@@ -0,0 +1,111 @@
+# 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.ebuild,v 1.1 2013/01/14 07:47:16 jlec Exp $
+
+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
+}