* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/files/, dev-util/nvidia-cuda-toolkit/, ...
@ 2014-11-17 9:20 Justin Lecher
0 siblings, 0 replies; only message in thread
From: Justin Lecher @ 2014-11-17 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 84cf6050a0ad069364645a656964cb35cdcc6f8b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 17 09:20:26 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 17 09:20:26 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=84cf6050
Imported to tree
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
dev-util/nvidia-cuda-sdk/ChangeLog | 9 --
dev-util/nvidia-cuda-sdk/metadata.xml | 17 ---
.../nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild | 145 ---------------------
dev-util/nvidia-cuda-toolkit/ChangeLog | 9 --
dev-util/nvidia-cuda-toolkit/files/cuda-config.in | 28 ----
dev-util/nvidia-cuda-toolkit/metadata.xml | 18 ---
.../nvidia-cuda-toolkit-6.5.19.ebuild | 144 --------------------
7 files changed, 370 deletions(-)
diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
deleted file mode 100644
index 8ecb9a7..0000000
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for dev-util/nvidia-cuda-sdk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*nvidia-cuda-sdk-6.5.19 (15 Nov 2014)
-
- 15 Nov 2014; Marius Brehler <marbre@linux.sungazer.de> +metadata.xml,
- +nvidia-cuda-sdk-6.5.19.ebuild:
- dev-util/nvidia-cuda-sdk: add version 6.5.19
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
deleted file mode 100644
index 288e495..0000000
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="opencl">
- Build OpenCL binaries.
- </flag>
- <flag name="cuda">
- Build CUDA binaries.
- </flag>
- </use>
-</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
deleted file mode 100644
index 93de750..0000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="amd64? ( ${CURI}/cuda_${PV}_linux_64.run )"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
- ~dev-util/nvidia-cuda-toolkit-${PV}
- media-libs/freeglut
- examples? (
- media-libs/freeimage
- media-libs/glew
- virtual/mpi
- >=x11-drivers/nvidia-drivers-343.22[uvm]
- )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/cuda-samples
-
-QA_EXECSTACK=(
- opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
- opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
- )
-
-src_unpack() {
- unpacker
- unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
- if use cuda || use opencl; then
- cuda_pkg_setup
- fi
-}
-
-src_prepare() {
- export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
-
- sed \
- -e 's:-O2::g' \
- -e 's:-O3::g' \
- -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
- -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
- -e "/CC/s:gcc:$(tc-getCC):g" \
- -e "/GCC/s:g++:$(tc-getCXX):g" \
- -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
- -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
- -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
- -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
- -e 's:-Wimplicit::g' \
- -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
- -i $(find . -type f -name "Makefile") || die
-
-# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
- find common/inc/GL -delete || die
- find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
- use examples || return
- local myopts verbose="verbose=1"
- use debug && myopts+=" dbg=1"
- export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
- emake \
- cuda-install="${EPREFIX}/opt/cuda" \
- CUDA_PATH="${EPREFIX}/opt/cuda/" \
- MPI_GCC=10 \
- ${myopts} ${verbose}
-}
-
-src_test() {
- local _dir _subdir
-
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
-
- for _dir in {0..9}*; do
- pushd ${_dir} > /dev/null
- for _subdir in *; do
- emake -C ${_subdir} run
- done
- popd > /dev/null
- done
-}
-
-src_install() {
- local i j f t crap=""
-
- if use doc; then
- ebegin "Installing docs ..."
- treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
- docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
- eend
- fi
-
- crap+=" *.txt Samples.htm*"
-
- ebegin "Cleaning before installation..."
- for i in ${crap}; do
- if [[ -e ${i} ]]; then
- find ${i} -delete || die
- fi
- done
- find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
- eend
-
- ebegin "Moving files..."
- for f in $(find .); do
- local t="$(dirname ${f})"
- if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
- continue
- fi
- if [[ ! -d ${f} ]]; then
- if [[ -x ${f} ]]; then
- exeinto /opt/cuda/sdk/${t}
- doexe ${f}
- else
- insinto /opt/cuda/sdk/${t}
- doins ${f}
- fi
- fi
- done
- eend
-}
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
deleted file mode 100644
index 12c3e68..0000000
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for dev-util/nvidia-cuda-toolkit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*nvidia-cuda-toolkit-6.5.19 (15 Nov 2014)
-
- 15 Nov 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
- +metadata.xml, +nvidia-cuda-toolkit-6.5.19.ebuild:
- dev-util/nvidia-cuda-toolkit: add version 6.5.19
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 5e09419..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>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-6.5.19.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild
deleted file mode 100644
index 98cbdf4..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
- amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
- x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
- <sys-devel/gcc-4.9[cxx]
- >=x11-drivers/nvidia-drivers-343.22[uvm]
- 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/*"
-
-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
-
- [[ -d doc ]] && 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} || 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] only message in thread
only message in thread, other threads:[~2014-11-17 9:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-17 9:20 [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/files/, dev-util/nvidia-cuda-toolkit/, Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox