commit:     a2fd90ae05dcc27d04772022a8563de2a9da5ff0
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Dec  1 09:00:02 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Thu Dec  1 09:00:28 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a2fd90ae

sci-libs/arrayfire: Fix FindCBLAS.cmake in 3.4.1-r1

Package-Manager: portage-2.3.0

 ...fire-3.4.1.ebuild => arrayfire-3.4.1-r1.ebuild} |  2 ++
 .../files/arrayfire-3.4.1-FindCBLAS.patch          | 37 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/sci-libs/arrayfire/arrayfire-3.4.1.ebuild 
b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
similarity index 98%
rename from sci-libs/arrayfire/arrayfire-3.4.1.ebuild
rename to sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
index 8c80bc3..563042a 100644
--- a/sci-libs/arrayfire/arrayfire-3.4.1.ebuild
+++ b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
@@ -52,6 +52,8 @@ S="${WORKDIR}/${PN}-full-${PV}"
 BUILD_DIR="${S}/build"
 CMAKE_BUILD_TYPE=Release
 
+PATCHES=("${FILESDIR}/${P}-FindCBLAS.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"

diff --git a/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch 
b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch
new file mode 100644
index 0000000..b75569f
--- /dev/null
+++ b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch
@@ -0,0 +1,37 @@
+https://github.com/arrayfire/arrayfire/pull/1657
+
+
+From 23228318b153bdc5bb30e084f9310b09b1644bd0 Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.breh...@tu-dortmund.de>
+Date: Wed, 30 Nov 2016 14:07:21 +0100
+Subject: [PATCH] FindCBLAS.cmake: Fix setting CBLAS_INCLUDE_DIR if PkgConfig
+ is used
+
+---
+ CMakeModules/FindCBLAS.cmake | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeModules/FindCBLAS.cmake b/CMakeModules/FindCBLAS.cmake
+index fbb646b..058b7d7 100644
+--- a/CMakeModules/FindCBLAS.cmake
++++ b/CMakeModules/FindCBLAS.cmake
+@@ -39,8 +39,14 @@ IF(PC_CBLAS_FOUND)
+     LIST(APPEND CBLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
+   ENDFOREACH(PC_LIB)
+ 
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES)
+-  MARK_AS_ADVANCED(CBLAS_LIBRARIES)
++  FIND_PATH(CBLAS_INCLUDE_DIRS NAMES cblas.h HINTS ${PC_CBLAS_INCLUDE_DIRS} )
++  IF (NOT CBLAS_INCLUDE_DIRS)
++    message(FATAL_ERROR "Something is wrong in your pkg-config file - cblas.h 
not found in ${PC_CBLAS_INCLUDE_DIRS}")
++  ENDIF (NOT CBLAS_INCLUDE_DIRS)
++  SET(CBLAS_INCLUDE_DIR ${CBLAS_INCLUDE_DIRS})
++
++  FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES 
CBLAS_INCLUDE_DIR)
++  MARK_AS_ADVANCED(CBLAS_LIBRARIES CBLAS_INCLUDE_DIR)
+ 
+ ELSE(PC_CBLAS_FOUND)
+ 
+-- 
+2.7.3
+

Reply via email to