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 51BBC138262 for ; Thu, 19 May 2016 07:14:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81DB5E07E6; Thu, 19 May 2016 07:14:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B567E07E6 for ; Thu, 19 May 2016 07:14:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F180340CCD for ; Thu, 19 May 2016 07:14:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E36DC87B for ; Thu, 19 May 2016 07:14:51 +0000 (UTC) From: "Marius Brehler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marius Brehler" Message-ID: <1463641681.d85e227cb142383049ee20008f014fe54da51240.marbre@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/arrayfire/arrayfire-3.3.2.ebuild sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch X-VCS-Directories: sci-libs/arrayfire/ sci-libs/arrayfire/files/ X-VCS-Committer: marbre X-VCS-Committer-Name: Marius Brehler X-VCS-Revision: d85e227cb142383049ee20008f014fe54da51240 X-VCS-Branch: master Date: Thu, 19 May 2016 07:14:51 +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: dfb5ed6d-08f0-453e-b0df-31a6a4b3f09c X-Archives-Hash: d69c401595bc0a81a51ac5b38b1712ab commit: d85e227cb142383049ee20008f014fe54da51240 Author: Marius Brehler linux sungazer de> AuthorDate: Thu May 19 07:08:01 2016 +0000 Commit: Marius Brehler linux sungazer de> CommitDate: Thu May 19 07:08:01 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d85e227c sci-libs/arrayfire: Version bump to 3.2.2 Package-Manager: portage-2.2.28 sci-libs/arrayfire/arrayfire-3.3.2.ebuild | 111 +++++++++++++++++++++ .../files/arrayfire-3.3.2-FindLAPACKE.patch | 28 ++++++ 2 files changed, 139 insertions(+) diff --git a/sci-libs/arrayfire/arrayfire-3.3.2.ebuild b/sci-libs/arrayfire/arrayfire-3.3.2.ebuild new file mode 100644 index 0000000..22b96bd --- /dev/null +++ b/sci-libs/arrayfire/arrayfire-3.3.2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils multilib + +GTEST_PV="1.7.0" + +DESCRIPTION="A general purpose GPU library" +HOMEPAGE="http://www.arrayfire.com/" +SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2 +test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" +KEYWORDS="~amd64" + +LICENSE="BSD + nonfree? ( OpenSIFT )" +SLOT="0" +IUSE="+examples +cpu cuda nonfree opencl test unified graphics" + +RDEPEND=" + >=sys-devel/gcc-4.7:* + media-libs/freeimage + cuda? ( + >=dev-util/nvidia-cuda-toolkit-7.5.18-r1 + dev-libs/boost + ) + cpu? ( + virtual/blas + virtual/cblas + virtual/lapacke + sci-libs/fftw:3.0 + ) + opencl? ( + virtual/blas + virtual/cblas + virtual/lapacke + dev-libs/boost + dev-libs/boost-compute + >=sci-libs/clblas-2.4 + >=sci-libs/clfft-2.6.1 + ) + graphics? ( + media-libs/glew + >=media-libs/glfw-3.1.1 + =sci-visualization/forge-3.2.2 + )" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}-full-${PV}" +BUILD_DIR="${S}/build" +CMAKE_BUILD_TYPE=Release + +PATCHES=("${FILESDIR}/${P}-FindLAPACKE.patch") + +# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage +# user is (usually) not in the video group +RESTRICT="userpriv" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then + die "Compilation with gcc older than 4.7 is not supported." + fi + fi +} + +src_unpack() { + default + + if ! use nonfree; then + find "${WORKDIR}" -name "*_nonfree*" -delete || die + fi + + if use test; then + mkdir -p "${BUILD_DIR}"/third_party/src/ || die + mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die + fi +} + +src_configure() { + if use cuda; then + addwrite /dev/nvidiactl + addwrite /dev/nvidia0 + addwrite /dev/nvidia-uvm + fi + + local mycmakeargs=( + $(cmake-utils_use_build cpu CPU) + $(cmake-utils_use_build cuda CUDA) + $(cmake-utils_use_build opencl OPENCL) + $(cmake-utils_use_build examples EXAMPLES) + $(cmake-utils_use_build test TEST) + $(cmake-utils_use_build graphics GRAPHICS) + $(cmake-utils_use_build nonfree NONFREE) + $(cmake-utils_use_build unified UNIFIED) + -DUSE_SYSTEM_BOOST_COMPUTE=ON + -DUSE_SYSTEM_CLBLAS=ON + -DUSE_SYSTEM_CLFFT=ON + -DUSE_SYSTEM_FORGE=ON + -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + dobin "${BUILD_DIR}/bin2cpp" +} diff --git a/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch b/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch new file mode 100644 index 0000000..ab9b2f5 --- /dev/null +++ b/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch @@ -0,0 +1,28 @@ +https://github.com/arrayfire/arrayfire/issues/1419 + + +From 2691d99693d6185d4f322a7776b1ced0e76877d2 Mon Sep 17 00:00:00 2001 +From: Shehzan Mohammed +Date: Wed, 18 May 2016 10:18:34 -0400 +Subject: [PATCH] BUGFIX Correctly handle lapacke found by package config + +--- + CMakeModules/FindLAPACKE.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeModules/FindLAPACKE.cmake b/CMakeModules/FindLAPACKE.cmake +index 5ecf7be..2ebd8dd 100644 +--- a/CMakeModules/FindLAPACKE.cmake ++++ b/CMakeModules/FindLAPACKE.cmake +@@ -143,7 +143,7 @@ ELSE(PC_LAPACKE_FOUND) + ENDIF(LAPACKE_ROOT_DIR) + ENDIF(PC_LAPACKE_FOUND) + +-IF(LAPACKE_LIB AND LAPACK_LIB) ++IF(PC_LAPACKE_FOUND OR (LAPACKE_LIB AND LAPACK_LIB)) + SET(LAPACK_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIB}) + ENDIF() + IF(LAPACKE_INCLUDES) +-- +2.7.3 +