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 979C71381F3 for ; Mon, 26 Nov 2012 22:03:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47614E06B1; Mon, 26 Nov 2012 22:02:05 +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 9A3A7E06B5 for ; Mon, 26 Nov 2012 22:02:04 +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 78F0133D9C6 for ; Mon, 26 Nov 2012 22:02:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 034C4E5449 for ; Mon, 26 Nov 2012 22:02:02 +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: <1353940868.1eaeeab8444bf3da8e09d76f0178e5516c82cc99.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-sdk/ X-VCS-Repository: proj/sci X-VCS-Files: dev-util/nvidia-cuda-sdk/ChangeLog dev-util/nvidia-cuda-sdk/metadata.xml dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild X-VCS-Directories: dev-util/nvidia-cuda-sdk/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 1eaeeab8444bf3da8e09d76f0178e5516c82cc99 X-VCS-Branch: master Date: Mon, 26 Nov 2012 22:02:02 +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: a78ecadd-7e3e-4ba2-bbb1-3a6066ad14c8 X-Archives-Hash: d3afde2fc8e6280296a8c9663ed61a0d commit: 1eaeeab8444bf3da8e09d76f0178e5516c82cc99 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 16 15:18:58 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Nov 26 14:41:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1eaeeab8 dev-util/nvidia-cuda-sdk: Reverted changes to bicatalis commit; Moving to cuda.eclass Package-Manager: portage-2.2.0_alpha142 --- dev-util/nvidia-cuda-sdk/ChangeLog | 6 ++ dev-util/nvidia-cuda-sdk/metadata.xml | 13 ++-- ....2.9.ebuild => nvidia-cuda-sdk-4.2.9-r1.ebuild} | 70 ++++++++++++-------- .../nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild | 20 ++++-- 4 files changed, 68 insertions(+), 41 deletions(-) diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog index 5e92775..09af82d 100644 --- a/dev-util/nvidia-cuda-sdk/ChangeLog +++ b/dev-util/nvidia-cuda-sdk/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.30 2012/02/05 16:39:02 spock Exp $ +*nvidia-cuda-sdk-4.2.9-r1 (16 Nov 2012) + + 16 Nov 2012; Justin Lecher nvidia-cuda-sdk-4.2.9.ebuild, + +nvidia-cuda-sdk-4.2.9-r1.ebuild, metadata.xml: + Reverted changes to bicatalis commit; Moving to cuda.eclass + 11 Jul 2012; Honza Macháček nvidia-cuda-sdk-4.2.9.ebuild: Corrected OpenCL spelling in `emake -C OpenCL` diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml index 23cb88d..1411995 100644 --- a/dev-util/nvidia-cuda-sdk/metadata.xml +++ b/dev-util/nvidia-cuda-sdk/metadata.xml @@ -1,15 +1,14 @@ -sci - + sci + The NVIDIA GPU Computing SDK provides hundreds of code samples, white papers, to help getting started on the path of writing software with CUDA C/C++ or DirectCompute. - - Build OpenCL binaries - Build CUDA binaries - + + Build OpenCL binaries + Build CUDA binaries + - diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild similarity index 64% copy from dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild copy to dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild index de89788..f42f58b 100644 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild @@ -27,40 +27,26 @@ DEPEND="${RDEPEND}" S=${WORKDIR} -gcc_supported_installed() { - local gcc_bindir _ver - for _ver in $*; do - has_version sys-devel/gcc:${_ver} && \ - gcc_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${_ver}* | tail -n 1)" && \ - break - done - if [[ -n ${gcc_bindir} ]]; then - echo "${gcc_bindir}" - return 0 - else - eerror "Only gcc version(s) $* are supported" - die "Only gcc version(s) $* are supported" - return 1 +pkg_setup() { + if use cuda || use opencl; then + cuda_pkg_setup fi } src_prepare() { - local nvcc_bindir - - if use cuda || use opencl && [[ $(tc-getCXX) == *g++* ]]; then - nvcc_bindir="--compiler-bindir=\"$(gcc_supported_installed 4.6 4.5 4.4)\"" - fi - 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 "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \ -e "/CC/s:gcc:$(tc-getCC):g" \ -e "/CX/s:g++:$(tc-getCXX):g" \ - -e "/NVCCFLAGS/s|\(:=\)|\1 ${nvcc_bindir} |g" \ + -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \ + -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \ + -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \ -e 's:-Wimplicit::g' \ - -e 's:-O2::g' \ -e 's:GLEW_x86_64:GLEW:g' \ -i $(find sdk -type f -name "*.mk") || die @@ -70,18 +56,43 @@ src_prepare() { src_compile() { use examples || return - local myopts="verbose=1" + local myopts verbose="verbose=1" use debug && myopts+=" dbg=1" cd sdk - use cuda && emake -C C cuda-install="${EPREFIX}/opt/cuda" ${myopts} - use opencl && emake -C OpenCL + use cuda && emake -C C cuda-install="${EPREFIX}/opt/cuda" ${myopts} ${verbose} + use opencl && emake -C OpenCL ${verbose} } src_install() { + local i j f t crap="" cd sdk - use doc || rm -rf *.txt doc */doc */Samples.htm */releaseNotesData - use examples || rm -rf bin */bin */tools - local f + if use doc; then + ebegin "Installing docs ..." + for i in *; do + if [[ -d ${i} ]]; then + for j in doc releaseNotesData; do + docinto ${i} + [[ -d ${i}/${j} ]] && dodoc -r ${i}/${j} + done + fi + done + dodoc -r doc + dohtml {.,*}/*htm* + eend + fi + + crap+=" *.txt doc */doc */Samples.htm* */releaseNotesData" + + if ! use examples; then + crap+=" */bin */tools" + fi + + ebegin "Cleaning before installation..." + find ${crap} -delete || die + find . \( -name Makefile -o -name "*.mk" \) -delete || die + eend + + ebegin "Moving files..." for f in $(find .); do local t="$(dirname ${f})" if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then @@ -97,4 +108,5 @@ src_install() { fi fi done + eend } diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild index de89788..514f943 100644 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild @@ -4,7 +4,7 @@ EAPI=4 -inherit cuda eutils unpacker toolchain-funcs versionator +inherit eutils unpacker toolchain-funcs versionator MYD=$(get_version_component_range 1)_$(get_version_component_range 2) DESCRIPTION="NVIDIA CUDA Software Development Kit" @@ -27,11 +27,20 @@ DEPEND="${RDEPEND}" S=${WORKDIR} +pkg_setup() { + if use cuda || use opencl && [[ $(tc-getCXX) == *gcc* ]] && \ + ! version_is_at_least 4.5 "$(gcc-version)"; then + eerror "This package requires >=sys-devel/gcc-4.5 to build sucessfully" + eerror "Please use gcc-config to switch to a compatible GCC version" + die ">=sys-devel/gcc-4.4 required" + fi +} + gcc_supported_installed() { local gcc_bindir _ver for _ver in $*; do has_version sys-devel/gcc:${_ver} && \ - gcc_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${_ver}* | tail -n 1)" && \ + gcc_bindir="$(ls -d "${EPREFIX}"/usr/*pc-linux-gnu/gcc-bin/${_ver}* | tail -n 1)" && \ break done if [[ -n ${gcc_bindir} ]]; then @@ -56,6 +65,7 @@ src_prepare() { sed \ -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \ -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \ + -e "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \ -e "/CC/s:gcc:$(tc-getCC):g" \ -e "/CX/s:g++:$(tc-getCXX):g" \ -e "/NVCCFLAGS/s|\(:=\)|\1 ${nvcc_bindir} |g" \ @@ -70,11 +80,11 @@ src_prepare() { src_compile() { use examples || return - local myopts="verbose=1" + local myopts verbose="verbose=1" use debug && myopts+=" dbg=1" cd sdk - use cuda && emake -C C cuda-install="${EPREFIX}/opt/cuda" ${myopts} - use opencl && emake -C OpenCL + use cuda && emake -C C cuda-install="${EPREFIX}/opt/cuda" ${myopts} ${verbose} + use opencl && emake -C OpenCL ${verbose} } src_install() {