From 1c4a3570ba4feb704de56bd4980768ddc2f642be Mon Sep 17 00:00:00 2001 From: grimmlin Date: Wed, 29 Sep 2010 09:15:39 +0000 Subject: [PATCH] cuda-sdk: fixed 3.0 ebuild --- dev-util/nvidia-cuda-sdk/Manifest | 2 +- ...-r1.ebuild => nvidia-cuda-sdk-3.0-r2.ebuild} | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) rename dev-util/nvidia-cuda-sdk/{nvidia-cuda-sdk-3.0-r1.ebuild => nvidia-cuda-sdk-3.0-r2.ebuild} (76%) diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest index 555bf01c1..805b05814 100644 --- a/dev-util/nvidia-cuda-sdk/Manifest +++ b/dev-util/nvidia-cuda-sdk/Manifest @@ -5,4 +5,4 @@ DIST cudasdk_2.3_linux.run 66005555 RMD160 e6995f190663ec5826f986420f2c02920a484 DIST gpucomputingsdk_3.0_linux.run 100306703 RMD160 5850ac6e4c80d5b8f01dfb1f4b34500bc3264650 SHA1 5e1e32a8d27249ea1a427256eaffee7c1f885d21 SHA256 7a3afdd52023cfa49bc67182729ce498cc85fa370dcd4bd33c299fb75945ec5e EBUILD nvidia-cuda-sdk-2.2-r1.ebuild 2110 RMD160 0e5728db169991c704a6033e5a3672406c6739ff SHA1 dfc39971e802af8154ed04d551cc322c1eb4be42 SHA256 01739d47178bc351b62257c2b4b065f59d834a559920df4a5b53870a3ac4004a EBUILD nvidia-cuda-sdk-2.3-r1.ebuild 2076 RMD160 3af209d0d3035bd176f3d71ec20dc589efe3382c SHA1 8f346d7b022f5f898c3d8bed302963b1a090756d SHA256 cb924578fdb59779cdb99d228f31493d735624530ce0436f6d42c1d713603ca5 -EBUILD nvidia-cuda-sdk-3.0-r1.ebuild 1705 RMD160 4eb001648159d0c71a5be4d6c2c6071849a02587 SHA1 e3d8cec0a40b76e5223daf5ffbd12c5af322c267 SHA256 b9ad5f81097fca407da713d7fa712a9bb812788e0f6407ce1036d980ba5edcda +EBUILD nvidia-cuda-sdk-3.0-r2.ebuild 1984 RMD160 670a272152d2a6113285bf825fb15868c1825d62 SHA1 861310930ae5e2039fa5d8051843d1f8daaf7319 SHA256 e5aad51e3aeeb3b1f860ecf4003d6e3b228b4832e49518b94ac01f786416be07 diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0-r2.ebuild similarity index 76% rename from dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0-r1.ebuild rename to dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0-r2.ebuild index 7a5f5c248..7e12158e2 100644 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0-r1.ebuild +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0.ebuild,v 1.1 2010/03/21 13:52:56 spock Exp $ +# $Header: $ EAPI=2 @@ -17,11 +17,11 @@ SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/sdk/gpucompu LICENSE="CUDPP" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug +doc emulation +examples opencl +cuda" +IUSE="debug doc emulation examples opencl +cuda +pentoo" RDEPEND=">=dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) - virtual/glut" + media-libs/freeglut" DEPEND="${RDEPEND}" S="${WORKDIR}" @@ -34,9 +34,16 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}"/$PN-gcc44.patch + sed -i -e 's:CUDA_INSTALL_PATH ?= .*:CUDA_INSTALL_PATH ?= /opt/cuda:' sdk/shared/common.mk sdk/C/common/common.mk || die "Failed to set path" } src_compile() { + cd "${S}/sdk/C" + emake lib/libcutil.so || die + emake lib/libparamgl.so || die + emake lib/librendercheckgl.so || die + emake shared/libshrutil.so || die + if ! use examples; then return fi @@ -76,6 +83,10 @@ src_install() { rm -rf bin tools fi + if ! use opencl; then + rm -rf OpenCL + fi + for f in $(find .); do local t="$(dirname ${f})" if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then