| 1 |
commit: a2fd90ae05dcc27d04772022a8563de2a9da5ff0 |
| 2 |
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 3 |
AuthorDate: Thu Dec 1 09:00:02 2016 +0000 |
| 4 |
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 5 |
CommitDate: Thu Dec 1 09:00:28 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a2fd90ae |
| 7 |
|
| 8 |
sci-libs/arrayfire: Fix FindCBLAS.cmake in 3.4.1-r1 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
...fire-3.4.1.ebuild => arrayfire-3.4.1-r1.ebuild} | 2 ++ |
| 13 |
.../files/arrayfire-3.4.1-FindCBLAS.patch | 37 ++++++++++++++++++++++ |
| 14 |
2 files changed, 39 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sci-libs/arrayfire/arrayfire-3.4.1.ebuild b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild |
| 17 |
similarity index 98% |
| 18 |
rename from sci-libs/arrayfire/arrayfire-3.4.1.ebuild |
| 19 |
rename to sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild |
| 20 |
index 8c80bc3..563042a 100644 |
| 21 |
--- a/sci-libs/arrayfire/arrayfire-3.4.1.ebuild |
| 22 |
+++ b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild |
| 23 |
@@ -52,6 +52,8 @@ S="${WORKDIR}/${PN}-full-${PV}" |
| 24 |
BUILD_DIR="${S}/build" |
| 25 |
CMAKE_BUILD_TYPE=Release |
| 26 |
|
| 27 |
+PATCHES=("${FILESDIR}/${P}-FindCBLAS.patch") |
| 28 |
+ |
| 29 |
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage |
| 30 |
# user is (usually) not in the video group |
| 31 |
RESTRICT="userpriv" |
| 32 |
|
| 33 |
diff --git a/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch |
| 34 |
new file mode 100644 |
| 35 |
index 0000000..b75569f |
| 36 |
--- /dev/null |
| 37 |
+++ b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch |
| 38 |
@@ -0,0 +1,37 @@ |
| 39 |
+https://github.com/arrayfire/arrayfire/pull/1657 |
| 40 |
+ |
| 41 |
+ |
| 42 |
+From 23228318b153bdc5bb30e084f9310b09b1644bd0 Mon Sep 17 00:00:00 2001 |
| 43 |
+From: Marius Brehler <marius.brehler@×××××××××××.de> |
| 44 |
+Date: Wed, 30 Nov 2016 14:07:21 +0100 |
| 45 |
+Subject: [PATCH] FindCBLAS.cmake: Fix setting CBLAS_INCLUDE_DIR if PkgConfig |
| 46 |
+ is used |
| 47 |
+ |
| 48 |
+--- |
| 49 |
+ CMakeModules/FindCBLAS.cmake | 10 ++++++++-- |
| 50 |
+ 1 file changed, 8 insertions(+), 2 deletions(-) |
| 51 |
+ |
| 52 |
+diff --git a/CMakeModules/FindCBLAS.cmake b/CMakeModules/FindCBLAS.cmake |
| 53 |
+index fbb646b..058b7d7 100644 |
| 54 |
+--- a/CMakeModules/FindCBLAS.cmake |
| 55 |
++++ b/CMakeModules/FindCBLAS.cmake |
| 56 |
+@@ -39,8 +39,14 @@ IF(PC_CBLAS_FOUND) |
| 57 |
+ LIST(APPEND CBLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) |
| 58 |
+ ENDFOREACH(PC_LIB) |
| 59 |
+ |
| 60 |
+- FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES) |
| 61 |
+- MARK_AS_ADVANCED(CBLAS_LIBRARIES) |
| 62 |
++ FIND_PATH(CBLAS_INCLUDE_DIRS NAMES cblas.h HINTS ${PC_CBLAS_INCLUDE_DIRS} ) |
| 63 |
++ IF (NOT CBLAS_INCLUDE_DIRS) |
| 64 |
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - cblas.h not found in ${PC_CBLAS_INCLUDE_DIRS}") |
| 65 |
++ ENDIF (NOT CBLAS_INCLUDE_DIRS) |
| 66 |
++ SET(CBLAS_INCLUDE_DIR ${CBLAS_INCLUDE_DIRS}) |
| 67 |
++ |
| 68 |
++ FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES CBLAS_INCLUDE_DIR) |
| 69 |
++ MARK_AS_ADVANCED(CBLAS_LIBRARIES CBLAS_INCLUDE_DIR) |
| 70 |
+ |
| 71 |
+ ELSE(PC_CBLAS_FOUND) |
| 72 |
+ |
| 73 |
+-- |
| 74 |
+2.7.3 |
| 75 |
+ |
Archives