From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 43D62138202 for ; Mon, 26 Nov 2012 22:03:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04B69E06F7; Mon, 26 Nov 2012 22:02:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 678FCE06F4 for ; Mon, 26 Nov 2012 22:02:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF35933D9D0 for ; Mon, 26 Nov 2012 22:02:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8CF6FE5455 for ; Mon, 26 Nov 2012 22:02:03 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1353940869.d60beb928c2b6018b7574224a07316f6434b0ff0.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/ X-VCS-Repository: proj/sci X-VCS-Files: dev-util/nvidia-cuda-toolkit/ChangeLog dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild X-VCS-Directories: dev-util/nvidia-cuda-toolkit/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d60beb928c2b6018b7574224a07316f6434b0ff0 X-VCS-Branch: master Date: Mon, 26 Nov 2012 22:02:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dfe0b3d3-48ea-4e24-ad58-2a0e65abd330 X-Archives-Hash: 36dad12f25da744de9e5881e936e6362 commit: d60beb928c2b6018b7574224a07316f6434b0ff0 Author: Justin Lecher gentoo org> AuthorDate: Sun Nov 25 17:09:05 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Nov 26 14:41:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d60beb92 dev-util/nvidia-cuda-toolkit: Merge change in both versions; fix whitespace error Package-Manager: portage-2.2.0_alpha142 --- dev-util/nvidia-cuda-toolkit/ChangeLog | 4 ++ .../nvidia-cuda-toolkit-4.2.9-r1.ebuild | 39 +++++++++++++++----- .../nvidia-cuda-toolkit-5.0.35.ebuild | 24 ++++++------ 3 files changed, 45 insertions(+), 22 deletions(-) diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog index 16f1d05..8bdd993 100644 --- a/dev-util/nvidia-cuda-toolkit/ChangeLog +++ b/dev-util/nvidia-cuda-toolkit/ChangeLog @@ -2,6 +2,10 @@ # 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 + 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 files/cuda-config.in: Enhancing cuda-config 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 index 6e71b8a..5c304e5 100644 --- 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 @@ -19,7 +19,7 @@ SRC_URI=" SLOT="0" LICENSE="NVIDIA" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debugger doc profiler" +IUSE="debugger doc eclipse profiler" DEPEND="" RDEPEND="${DEPEND} @@ -36,6 +36,11 @@ 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 @@ -44,29 +49,30 @@ src_prepare() { 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 prefix="${EPREFIX}"${cudadir} - rm install-linux.pl - # use system jre - rm -r libnvvp/jre + 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}:${prefix}/lib:${prefix}/lib64 \ - UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${prefix}/libnvvp/nvvp + 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 @@ -77,11 +83,24 @@ src_install() { mv * "${ED}"${cudadir} cat > "${T}"/99cuda <<- EOF - PATH=${prefix}/bin:${prefix}/libnvvp - ROOTPATH=${prefix}/bin - LDPATH=${prefix}/lib$(use amd64 && echo "64:${prefix}/lib") + 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 index e3acc1b..a17f442 100644 --- 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 @@ -37,8 +37,8 @@ S="${WORKDIR}" QA_PREBUILT="opt/cuda/*" pkg_setup() { - # We don't like to run cuda_pkg_setup as it depends on us - : + # We don't like to run cuda_pkg_setup as it depends on us + : } src_unpack() { @@ -98,14 +98,14 @@ src_install() { } 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 + 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 }