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 2C3041381F3 for ; Mon, 26 Nov 2012 22:04:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D154AE06C1; Mon, 26 Nov 2012 22:02:07 +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 3D48AE06C0 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 B45DD33D9D2 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 0E82FE5451 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.0c1d859a2a667868824f9db85bb3e907ba5452be.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/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: 0c1d859a2a667868824f9db85bb3e907ba5452be 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: c05969f2-af78-402c-8446-d12238ada91f X-Archives-Hash: 61cbfe779ba7996321f1885bc86208df commit: 0c1d859a2a667868824f9db85bb3e907ba5452be Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 23 18:25:18 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=0c1d859a do not call pkg_setup from cuda.eclass --- .../nvidia-cuda-toolkit-5.0.35.ebuild | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) 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 0bae2d3..3f7383e 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 @@ -36,6 +36,11 @@ S="${WORKDIR}" QA_PREBUILT="opt/cuda/*" +pkg_setup() { + # We don't like to run cuda_pkg_setup + : +} + src_unpack() { unpacker unpacker run_files/cudatoolkit*run @@ -55,7 +60,7 @@ src_prepare() { src_install() { local cudadir=/opt/cuda - local prefix="${EPREFIX}"${cudadir} + local ecudadir="${EPREFIX}"${cudadir} if use doc; then dodoc doc/{*.txt,pdf/*} @@ -71,8 +76,8 @@ src_install() { # 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 @@ -83,9 +88,9 @@ 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