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 7578D138A1A for ; Sat, 10 Jan 2015 18:03:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DC8CE082F; Sat, 10 Jan 2015 18:03:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D49BE082F for ; Sat, 10 Jan 2015 18:03:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42B9D3406DF for ; Sat, 10 Jan 2015 18:03:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E60FFF4A5 for ; Sat, 10 Jan 2015 18:03:22 +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: <1420891392.8c3bb69148954714ff4e8614fce7acbb02e95bd8.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/arrayfire/arrayfire-9999.ebuild sci-libs/arrayfire/metadata.xml X-VCS-Directories: sci-libs/arrayfire/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8c3bb69148954714ff4e8614fce7acbb02e95bd8 X-VCS-Branch: master Date: Sat, 10 Jan 2015 18:03:22 +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: 4b64e099-69b3-47d7-82cf-620b82483d38 X-Archives-Hash: 5749014e05840fba6166c6f6015d59fe commit: 8c3bb69148954714ff4e8614fce7acbb02e95bd8 Author: Marius Brehler linux sungazer de> AuthorDate: Sat Jan 10 12:03:12 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jan 10 12:03:12 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8c3bb691 Get arrayfire working --- sci-libs/arrayfire/arrayfire-9999.ebuild | 68 ++++++++++---------------------- sci-libs/arrayfire/metadata.xml | 4 +- 2 files changed, 23 insertions(+), 49 deletions(-) diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild index 06295ca..0a24116 100644 --- a/sci-libs/arrayfire/arrayfire-9999.ebuild +++ b/sci-libs/arrayfire/arrayfire-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-utils eutils git-r3 toolchain-funcs +inherit cmake-utils eutils git-r3 DESCRIPTION="A general purpose GPU library." HOMEPAGE="http://www.arrayfire.com/" @@ -13,7 +13,7 @@ KEYWORDS="~amd64" LICENSE="ArrayFire" SLOT="0" -IUSE="+examples +cpu cuda" +IUSE="+examples +cpu cuda test" RDEPEND=" >=sys-devel/gcc-4.7.3-r1 @@ -21,7 +21,12 @@ RDEPEND=" virtual/cblas cuda? ( >=dev-util/nvidia-cuda-toolkit-6.0 ) sci-libs/fftw:3.0" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( dev-vcs/subversion )" + +S="${WORKDIR}/${P}" +BUILD_DIR="${S}/build" +CMAKE_BUILD_TYPE=Release # We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage # user is (usually) not in the video group @@ -29,23 +34,14 @@ if use cuda; then RESTRICT="userpriv" fi -S="${WORKDIR}/${P}" - -QA_PREBUILT="/usr/share/arrayfire/examples/helloworld_cpu - /usr/share/arrayfire/examples/pi_cpu - /usr/share/arrayfire/examples/vectorize_cpu - /usr/share/arrayfire/examples/helloworld_cuda - /usr/share/arrayfire/examples/pi_cuda - /usr/share/arrayfire/examples/vectorize_cuda" - -src_unpack() { - git-r3_src_unpack -} - src_prepare() { if use cpu; then epatch "${FILESDIR}/FindCBLAS.patch" fi + if use examples; then + epatch "${FILESDIR}/CMakeLists_examples.patch" + fi + cmake-utils_src_prepare } @@ -56,20 +52,14 @@ src_configure() { addwrite /dev/nvidia-uvm fi - local mycmakeargs=" - -DCMAKE_BUILD_TYPE=Release - $(cmake-utils_use_build cpu CPU) - $(cmake-utils_use_build cuda CUDA) - -DBUILD_OPENCL=OFF - $(cmake-utils_use_build examples EXAMPLES) - -DBUILD_TEST=OFF - " - - BUILD_DIR="${S}/build" cmake-utils_src_configure -} - -src_compile() { - BUILD_DIR="${S}/build" cmake-utils_src_compile + local mycmakeargs=( + $(cmake-utils_use_build cpu CPU) + $(cmake-utils_use_build cuda CUDA) + -DBUILD_OPENCL=OFF + $(cmake-utils_use_build examples EXAMPLES) + $(cmake-utils_use_build test TEST) + ) + cmake-utils_src_configure } src_install() { @@ -77,20 +67,4 @@ src_install() { exeinto /usr/bin doexe "build/bin2cpp" - - if use examples; then - ebegin "Installing examples" - exeinto /usr/share/arrayfire/examples/ - if use cpu; then - doexe "build/examples/helloworld_cpu" - doexe "build/examples/pi_cpu" - doexe "build/examples/vectorize_cpu" - fi - if use cuda; then - doexe "build/examples/helloworld_cuda" - doexe "build/examples/pi_cuda" - doexe "build/examples/vectorize_cuda" - fi - eend - fi -} \ No newline at end of file +} diff --git a/sci-libs/arrayfire/metadata.xml b/sci-libs/arrayfire/metadata.xml index cf929e4..3daddf2 100644 --- a/sci-libs/arrayfire/metadata.xml +++ b/sci-libs/arrayfire/metadata.xml @@ -11,7 +11,7 @@ Enable CPU Build. flag> - Enable CUDA Build. - + Enable CUDA Build. +