commit: 515eacebe71737b1aa2ee946b3cf5d97f79787f8 Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Sat May 23 15:41:19 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sat May 23 15:41:19 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=515eaceb
sci-libs/arrayfire: Split up ebuilds to fix 9999 Package-Manager: portage-2.2.18 sci-libs/arrayfire/ChangeLog | 9 +++++++++ sci-libs/arrayfire/arrayfire-9999.ebuild | 15 +++++---------- sci-libs/arrayfire/files/FindBoostCompute.cmake | 18 ++++++++++++++++++ ...tch => arrayfire-3.0_beta-FindBoostCompute.patch} | 0 ...BLAS.patch => arrayfire-3.0_beta-FindCBLAS.patch} | 0 ...ch => arrayfire-3.0_beta-opencl_CMakeLists.patch} | 0 ...indCBLAS.patch => arrayfire-9999-FindCBLAS.patch} | 20 ++++++++++---------- 7 files changed, 42 insertions(+), 20 deletions(-) diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog index 0ba6260..6123184 100644 --- a/sci-libs/arrayfire/ChangeLog +++ b/sci-libs/arrayfire/ChangeLog @@ -1,6 +1,15 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 23 May 2015; Marius Brehler <[email protected]> + +files/FindBoostCompute.cmake, + +files/arrayfire-3.0_beta-FindBoostCompute.patch, + +files/arrayfire-3.0_beta-FindCBLAS.patch, + +files/arrayfire-3.0_beta-opencl_CMakeLists.patch, + +files/arrayfire-9999-FindCBLAS.patch, -files/FindBoostCompute.patch, + -files/FindCBLAS.patch, -files/opencl_CMakeLists.patch, arrayfire-9999.ebuild: + Split up ebuilds to fix 9999 + 24 Mar 2015; Marius Brehler <[email protected]> -files/arrayfire-0.9999-build_gtest.patch: Drop patch, fixed upstream diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild index dda442e..b976a15 100644 --- a/sci-libs/arrayfire/arrayfire-9999.ebuild +++ b/sci-libs/arrayfire/arrayfire-9999.ebuild @@ -13,13 +13,6 @@ HOMEPAGE="http://www.arrayfire.com/"; EGIT_REPO_URI="https://github.com/${PN}/${PN}.git git://github.com/${PN}/${PN}.git" SRC_URI="test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" KEYWORDS="" -if [[ ${PV} == "0.9999" ]] ; then - # the remote HEAD points to devel, but we want to pull the master instead - EGIT_BRANCH="master" -elif [[ ${PV} == "3.0_beta" ]] ; then - EGIT_COMMIT="v3.0beta" - KEYWORDS="~amd64" -fi LICENSE="BSD" SLOT="0" @@ -34,6 +27,7 @@ RDEPEND=" cpu? ( virtual/blas virtual/cblas + virtual/lapacke sci-libs/fftw:3.0 ) opencl? ( @@ -48,9 +42,7 @@ BUILD_DIR="${S}/build" CMAKE_BUILD_TYPE=Release PATCHES=( - "${FILESDIR}"/FindCBLAS.patch - "${FILESDIR}"/FindBoostCompute.patch - "${FILESDIR}"/opencl_CMakeLists.patch + "${FILESDIR}"/${P}-FindCBLAS.patch ) # We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage @@ -74,6 +66,9 @@ src_unpack() { unpack ${A} mv "${BUILD_DIR}"/third_party/src/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die fi + + rm "${S}"/CMakeModules/build_boost_compute.cmake || die + cp "${FILESDIR}"/FindBoostCompute.cmake "${S}"/CMakeModules/ || die } src_configure() { diff --git a/sci-libs/arrayfire/files/FindBoostCompute.cmake b/sci-libs/arrayfire/files/FindBoostCompute.cmake new file mode 100644 index 0000000..d98ea4b --- /dev/null +++ b/sci-libs/arrayfire/files/FindBoostCompute.cmake @@ -0,0 +1,18 @@ +# Downloads and builds the Boost Compute library from github.com +# Defines the following variables +# * BoostCompute_FOUND Flag for Boost Compute +# * BoostCompute_INCLUDE_DIR Location of the Boost Compute headers + + +set(BoostCompute_INCLUDE_DIR "/usr/include/compute") +SET( BoostCompute_FOUND ON CACHE BOOL "BoostCompute Found" ) + + +IF(NOT BoostCompute_FOUND) + MESSAGE(FATAL_ERROR, "Boost.Compute not found! Clone Boost.Compute from https://github.com/kylelutz/compute.git";) +ENDIF(NOT BoostCompute_FOUND) + +MARK_AS_ADVANCED( + BoostCompute_FOUND + BoostCompute_INCLUDE_DIR + ) diff --git a/sci-libs/arrayfire/files/FindBoostCompute.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch similarity index 100% rename from sci-libs/arrayfire/files/FindBoostCompute.patch rename to sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch diff --git a/sci-libs/arrayfire/files/FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch similarity index 100% copy from sci-libs/arrayfire/files/FindCBLAS.patch copy to sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch diff --git a/sci-libs/arrayfire/files/opencl_CMakeLists.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch similarity index 100% rename from sci-libs/arrayfire/files/opencl_CMakeLists.patch rename to sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch diff --git a/sci-libs/arrayfire/files/FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch similarity index 75% rename from sci-libs/arrayfire/files/FindCBLAS.patch rename to sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch index 263c62a..7f757e8 100644 --- a/sci-libs/arrayfire/files/FindCBLAS.patch +++ b/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch @@ -2,8 +2,8 @@ Use pkg-config to find cblas. Patch by Marius Brehler. ---- b/CMakeModules/FindCBLAS.cmake -+++ a/CMakeModules/FindCBLAS.cmake +--- CMakeModules/FindCBLAS.cmake 2015-05-23 17:12:41.000000000 +0200 ++++ CMakeModules/FindCBLAS.cmake.new 2015-05-23 17:13:51.000000000 +0200 @@ -1,3 +1,9 @@ +# +# Version modified for Gentoo Linux @@ -14,9 +14,9 @@ Patch by Marius Brehler. # Using FindCBLAS.cmake from the following repo # https://github.com/clementfarabet/THC/blob/master/COPYRIGHT.txt -@@ -18,6 +24,29 @@ SET(CBLAS_LIBRARIES) - SET(CBLAS_INCLUDE_DIR) - SET(CBLAS_INCLUDE_FILE) +@@ -21,6 +27,29 @@ SET(CBLAS_INCLUDE_DIR CACHE STRING + SET(CBLAS_INCLUDE_FILE CACHE STRING + "CBLAS header name") + +# @@ -41,12 +41,12 @@ Patch by Marius Brehler. + + + - # CBLAS in Intel mkl - FIND_PACKAGE(MKL) - IF (MKL_FOUND AND NOT CBLAS_LIBRARIES) -@@ -203,3 +232,5 @@ IF(NOT CBLAS_FIND_QUIETLY) + SET(INTEL_MKL_ROOT_DIR CACHE STRING + "Root directory of the Intel MKL") + +@@ -277,3 +306,5 @@ IF(NOT CBLAS_FIND_QUIETLY) MESSAGE(STATUS "CBLAS library not found.") - ENDIF(CBLAS_FOUND) + ENDIF() ENDIF(NOT CBLAS_FIND_QUIETLY) + +endif(PC_CBLAS_FOUND)
