commit: 41d6ecc7e3f377ee124e747d623fac7c1650d00f
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue Sep 8 10:49:01 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 10:49:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=41d6ecc7
sci-libs/arrayfire: Fix issue #463
Package-Manager: portage-2.2.20.1
sci-libs/arrayfire/ChangeLog | 5 +
sci-libs/arrayfire/arrayfire-9999.ebuild | 11 +-
...re-9999-Try-PkgConf-first-to-find-LAPACKE.patch | 182 +++++++++++++++++++++
3 files changed, 195 insertions(+), 3 deletions(-)
diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 994387a..22c0ef3 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -2,6 +2,11 @@
# $Id$
08 Sep 2015; Marius Brehler <mar...@linux.sungazer.de>
+ +files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch,
+ arrayfire-9999.ebuild:
+ sci-libs/arrayfire: Fix issue #463
+
+ 08 Sep 2015; Marius Brehler <mar...@linux.sungazer.de>
-arrayfire-0.9999.ebuild:
sci-libs/arrayfire: Drop 0.9999, because releases are available
diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild
b/sci-libs/arrayfire/arrayfire-9999.ebuild
index e337177..5eb95c7 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -20,6 +20,7 @@ IUSE="+examples +cpu cuda opencl test"
RDEPEND="
>=sys-devel/gcc-4.7:*
+ media-libs/freeimage
cuda? (
>=dev-util/nvidia-cuda-toolkit-6.0
dev-libs/boost
@@ -31,6 +32,9 @@ RDEPEND="
sci-libs/fftw:3.0
)
opencl? (
+ virtual/blas
+ virtual/cblas
+ virtual/lapacke
dev-libs/boost
dev-libs/boost-compute
sci-libs/clblas
@@ -43,6 +47,7 @@ CMAKE_BUILD_TYPE=Release
PATCHES=(
"${FILESDIR}"/${P}-FindCBLAS.patch
+ "${FILESDIR}"/${P}-Try-PkgConf-first-to-find-LAPACKE.patch
)
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and
the portage
@@ -66,9 +71,6 @@ 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() {
@@ -85,6 +87,9 @@ src_configure() {
$(cmake-utils_use_build examples EXAMPLES)
$(cmake-utils_use_build test TEST)
-DUSE_SYSTEM_BOOST_COMPUTE=ON
+ -DUSE_SYSTEM_CLBLAS=ON
+ -DUSE_SYSTEM_CLFFT=ON
+ -DBUILD_GRAPHICS=OFF
)
cmake-utils_src_configure
}
diff --git
a/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
b/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
new file mode 100644
index 0000000..549b7b8
--- /dev/null
+++
b/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
@@ -0,0 +1,182 @@
+From 0c64e3d30dce121fe41d0149592be3a0a605588a Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.breh...@tu-dortmund.de>
+Date: Tue, 8 Sep 2015 09:50:12 +0200
+Subject: [PATCH] Try PkgConf first to find LAPACKE
+
+---
+ CMakeModules/FindLAPACKE.cmake | 145 ++++++++++++++++++++++++-----------------
+ 1 file changed, 87 insertions(+), 58 deletions(-)
+
+diff --git a/CMakeModules/FindLAPACKE.cmake b/CMakeModules/FindLAPACKE.cmake
+index 05d218a..3bdc273 100644
+--- a/CMakeModules/FindLAPACKE.cmake
++++ b/CMakeModules/FindLAPACKE.cmake
+@@ -18,70 +18,23 @@ FIND_PACKAGE(PkgConfig)
+
+ #Determine from PKG
+ IF(PKG_CONFIG_FOUND AND NOT LAPACKE_ROOT)
+- PKG_CHECK_MODULES( PKG_LAPACKE QUIET "lapacke")
++ PKG_CHECK_MODULES( PC_LAPACKE QUIET "lapacke")
+ ENDIF()
+
+-IF(LAPACKE_ROOT)
+- #find libs
+- FIND_LIBRARY(
+- LAPACKE_LIB
+- NAMES "lapacke" "LAPACKE" "liblapacke"
+- PATHS ${LAPACKE_ROOT}
+- PATH_SUFFIXES "lib" "lib64"
+- DOC "LAPACKE Library"
+- NO_DEFAULT_PATH
+- )
+- FIND_LIBRARY(
+- LAPACK_LIB
+- NAMES "lapack" "LAPACK" "liblapack"
+- PATHS ${LAPACKE_ROOT}
+- PATH_SUFFIXES "lib" "lib64"
+- DOC "LAPACK Library"
+- NO_DEFAULT_PATH
+- )
+- FIND_PATH(
+- LAPACKE_INCLUDES
+- NAMES "lapacke.h"
+- PATHS ${LAPACKE_ROOT}
+- PATH_SUFFIXES "include"
+- DOC "LAPACKE Include Directory"
+- NO_DEFAULT_PATH
+- )
++IF(PC_LAPACKE_FOUND)
++ FOREACH(PC_LIB ${PC_LAPACKE_LIBRARIES})
++ FIND_LIBRARY(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS
${PC_LAPACKE_LIBRARY_DIRS} )
++ IF (NOT ${PC_LIB}_LIBRARY)
++ MESSAGE(FATAL_ERROR "Something is wrong in your pkg-config file - lib
${PC_LIB} not found in ${PC_LAPACKE_LIBRARY_DIRS}")
++ ENDIF (NOT ${PC_LIB}_LIBRARY)
++ LIST(APPEND LAPACKE_LIB ${${PC_LIB}_LIBRARY})
++ ENDFOREACH(PC_LIB)
+
+-ELSE()
+- FIND_LIBRARY(
+- LAPACKE_LIB
+- NAMES "lapacke" "liblapacke"
+- PATHS
+- ${PKG_LAPACKE_LIBRARY_DIRS}
+- ${LIB_INSTALL_DIR}
+- /usr/lib64
+- /usr/lib
+- /usr/local/lib64
+- /usr/local/lib
+- /sw/lib
+- /opt/local/lib
+- DOC "LAPACKE Library"
+- )
+- FIND_LIBRARY(
+- LAPACK_LIB
+- NAMES "lapack" "liblapack"
+- PATHS
+- ${PKG_LAPACKE_LIBRARY_DIRS}
+- ${LIB_INSTALL_DIR}
+- /usr/lib64
+- /usr/lib
+- /usr/local/lib64
+- /usr/local/lib
+- /sw/lib
+- /opt/local/lib
+- DOC "LAPACK Library"
+- )
+ FIND_PATH(
+ LAPACKE_INCLUDES
+ NAMES "lapacke.h"
+ PATHS
+- ${PKG_LAPACKE_INCLUDE_DIRS}
++ ${PC_LAPACKE_INCLUDE_DIRS}
+ ${INCLUDE_INSTALL_DIR}
+ /usr/include
+ /usr/local/include
+@@ -89,7 +42,83 @@ ELSE()
+ /opt/local/include
+ DOC "LAPACKE Include Directory"
+ )
+-ENDIF(LAPACKE_ROOT)
++
++ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LAPACKE DEFAULT_MSG LAPACKE_LIB)
++ MARK_AS_ADVANCED(LAPACKE_INCLUDES LAPACKE_LIB)
++
++ELSE(PC_LAPACKE_FOUND)
++ MESSAGE(STATUS "No PkgConfig configuration for LAPACKE found; starting
more extensive search.")
++
++ IF(LAPACKE_ROOT)
++ #find libs
++ FIND_LIBRARY(
++ LAPACKE_LIB
++ NAMES "lapacke" "LAPACKE" "liblapacke"
++ PATHS ${LAPACKE_ROOT}
++ PATH_SUFFIXES "lib" "lib64"
++ DOC "LAPACKE Library"
++ NO_DEFAULT_PATH
++ )
++ FIND_LIBRARY(
++ LAPACK_LIB
++ NAMES "lapack" "LAPACK" "liblapack"
++ PATHS ${LAPACKE_ROOT}
++ PATH_SUFFIXES "lib" "lib64"
++ DOC "LAPACK Library"
++ NO_DEFAULT_PATH
++ )
++ FIND_PATH(
++ LAPACKE_INCLUDES
++ NAMES "lapacke.h"
++ PATHS ${LAPACKE_ROOT}
++ PATH_SUFFIXES "include"
++ DOC "LAPACKE Include Directory"
++ NO_DEFAULT_PATH
++ )
++
++ ELSE()
++ FIND_LIBRARY(
++ LAPACKE_LIB
++ NAMES "lapacke" "liblapacke"
++ PATHS
++ ${PC_LAPACKE_LIBRARY_DIRS}
++ ${LIB_INSTALL_DIR}
++ /usr/lib64
++ /usr/lib
++ /usr/local/lib64
++ /usr/local/lib
++ /sw/lib
++ /opt/local/lib
++ DOC "LAPACKE Library"
++ )
++ FIND_LIBRARY(
++ LAPACK_LIB
++ NAMES "lapack" "liblapack"
++ PATHS
++ ${PC_LAPACKE_LIBRARY_DIRS}
++ ${LIB_INSTALL_DIR}
++ /usr/lib64
++ /usr/lib
++ /usr/local/lib64
++ /usr/local/lib
++ /sw/lib
++ /opt/local/lib
++ DOC "LAPACK Library"
++ )
++ FIND_PATH(
++ LAPACKE_INCLUDES
++ NAMES "lapacke.h"
++ PATHS
++ ${PC_LAPACKE_INCLUDE_DIRS}
++ ${INCLUDE_INSTALL_DIR}
++ /usr/include
++ /usr/local/include
++ /sw/include
++ /opt/local/include
++ DOC "LAPACKE Include Directory"
++ )
++ ENDIF(LAPACKE_ROOT)
++ENDIF(PC_LAPACKE_FOUND)
+
+ SET(LAPACK_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIB})
+ SET(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDES})
+--
+2.4.6
+
