jlec 14/06/16 20:30:02
Modified: ChangeLog
Added: nvidia-cuda-toolkit-6.0.37-r3.ebuild
Removed: nvidia-cuda-toolkit-6.0.37.ebuild
nvidia-cuda-toolkit-6.0.37-r2.ebuild
nvidia-cuda-toolkit-6.0.37-r1.ebuild
Log:
dev-util/nvidia-cuda-toolkit: Fix cuda-config
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.86 dev-util/nvidia-cuda-toolkit/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?rev=1.86&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?rev=1.86&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?r1=1.85&r2=1.86
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ChangeLog 16 Jun 2014 20:18:13 -0000 1.85
+++ ChangeLog 16 Jun 2014 20:30:02 -0000 1.86
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/nvidia-cuda-toolkit
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v
1.85 2014/06/16 20:18:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v
1.86 2014/06/16 20:30:02 jlec Exp $
+
+*nvidia-cuda-toolkit-6.0.37-r3 (16 Jun 2014)
+
+ 16 Jun 2014; Justin Lecher <[email protected]>
+ -nvidia-cuda-toolkit-6.0.37.ebuild, -nvidia-cuda-toolkit-6.0.37-r1.ebuild,
+ -nvidia-cuda-toolkit-6.0.37-r2.ebuild, +nvidia-cuda-toolkit-6.0.37-r3.ebuild:
+ Fix cuda-config
16 Jun 2014; Justin Lecher <[email protected]>
nvidia-cuda-toolkit-6.0.37-r2.ebuild:
1.1
dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r3.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r3.ebuild?rev=1.1&content-type=text/plain
Index: nvidia-cuda-toolkit-6.0.37-r3.ebuild
===================================================================
# Copyright 1999-2014 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-6.0.37-r3.ebuild,v
1.1 2014/06/16 20:30:02 jlec Exp $
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-334.16-r7[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
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
}
