[gentoo-commits] proj/sci:master commit in: sci-libs/clblas/

[Marius Brehler]

commit:     e81e09a9ced382302db31f37ac55948804dab28a
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Nov 30 08:12:44 2015 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon Nov 30 08:12:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e81e09a9

sci-libs/clblas: Build against CL-1.2, closes issue #543

Package-Manager: portage-2.2.20.1

 sci-libs/clblas/ChangeLog                                   |  6 ++++++
 sci-libs/clblas/{clblas-2.6.ebuild => clblas-2.6-r1.ebuild} | 11 +++++++++++
 sci-libs/clblas/clblas-9999.ebuild                          | 11 +++++++++++
 3 files changed, 28 insertions(+)

diff --git a/sci-libs/clblas/ChangeLog b/sci-libs/clblas/ChangeLog
index e74dc52..217f674 100644
--- a/sci-libs/clblas/ChangeLog
+++ b/sci-libs/clblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*clblas-2.6-r1 (30 Nov 2015)
+
+  30 Nov 2015; Marius Brehler <marbre@××××××××××××××.de> +clblas-2.6-r1.ebuild,
+  -clblas-2.6.ebuild, clblas-9999.ebuild:
+  sci-libs/clblas: Build against CL-1.2, closes issue #543
+
 *clblas-2.6 (12 Sep 2015)
 
   12 Sep 2015; Marius Brehler <marbre@××××××××××××××.de> +clblas-2.6.ebuild:

diff --git a/sci-libs/clblas/clblas-2.6.ebuild b/sci-libs/clblas/clblas-2.6-r1.ebuild
similarity index 76%
rename from sci-libs/clblas/clblas-2.6.ebuild
rename to sci-libs/clblas/clblas-2.6-r1.ebuild
index d060857..15ca8d5 100644
--- a/sci-libs/clblas/clblas-2.6.ebuild
+++ b/sci-libs/clblas/clblas-2.6-r1.ebuild
@@ -45,6 +45,16 @@ pkg_pretend() {
 			die "Compilation with gcc older than 4.6 is not supported."
 		fi
 	fi
+
+	if [ ! -d "/usr/local/include/CL" ]; then
+		eerror "As a temporary workaround for Bug #521734, a symlink pointing to"
+		eerror "OpenCL headers >= 1.2 is needed. A symlink pointing to the CL-1.2"
+		eerror "headers, provided by the eselect-opencl package, can be created with"
+		eerror ""
+		eerror "  ln -s /usr/lib64/OpenCL/global/include/CL-1.2/ /usr/local/include/CL"
+		eerror ""
+		die "/usr/local/include/CL not found"
+	fi
 }
 
 src_configure() {
@@ -54,6 +64,7 @@ src_configure() {
 		$(cmake-utils_use_build ktest KTEST)
 		$(cmake-utils_use_build performance PERFORMANCE)
 		$(cmake-utils_use_build test TEST)
+		-DOPENCL_ROOT="/usr/local/include"
 	)
 	cmake-utils_src_configure
 }

diff --git a/sci-libs/clblas/clblas-9999.ebuild b/sci-libs/clblas/clblas-9999.ebuild
index 4a25302..84404a9 100644
--- a/sci-libs/clblas/clblas-9999.ebuild
+++ b/sci-libs/clblas/clblas-9999.ebuild
@@ -45,6 +45,16 @@ pkg_pretend() {
 			die "Compilation with gcc older than 4.6 is not supported."
 		fi
 	fi
+
+	if [ ! -d "/usr/local/include/CL" ]; then
+		eerror "As a temporary workaround for Bug #521734, a symlink pointing to"
+		eerror "OpenCL headers >= 1.2 is needed. A symlink pointing to the CL-1.2"
+		eerror "headers, provided by the eselect-opencl package, can be created with"
+		eerror ""
+		eerror "  ln -s /usr/lib64/OpenCL/global/include/CL-1.2/ /usr/local/include/CL"
+		eerror ""
+		die "/usr/local/include/CL not found"
+	fi
 }
 
 src_configure() {
@@ -54,6 +64,7 @@ src_configure() {
 		$(cmake-utils_use_build ktest KTEST)
 		$(cmake-utils_use_build performance PERFORMANCE)
 		$(cmake-utils_use_build test TEST)
+		-DOPENCL_ROOT="/usr/local/include"
 	)
 	cmake-utils_src_configure
 }