From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6D8F21384B4 for ; Mon, 30 Nov 2015 08:13:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CADF421C056; Mon, 30 Nov 2015 08:13:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A08421C056 for ; Mon, 30 Nov 2015 08:13:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A74823406C2 for ; Mon, 30 Nov 2015 08:13:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C53FA4A for ; Mon, 30 Nov 2015 08:13:37 +0000 (UTC) From: "Marius Brehler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marius Brehler" Message-ID: <1448871164.e81e09a9ced382302db31f37ac55948804dab28a.marbre@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/clblas/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/clblas/ChangeLog sci-libs/clblas/clblas-2.6-r1.ebuild sci-libs/clblas/clblas-2.6.ebuild sci-libs/clblas/clblas-9999.ebuild X-VCS-Directories: sci-libs/clblas/ X-VCS-Committer: marbre X-VCS-Committer-Name: Marius Brehler X-VCS-Revision: e81e09a9ced382302db31f37ac55948804dab28a X-VCS-Branch: master Date: Mon, 30 Nov 2015 08:13:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9c841fb6-97ea-41c9-bd4d-99dd5c8b9266 X-Archives-Hash: fdd12374b36e96ca3780364b5810bc33 commit: e81e09a9ced382302db31f37ac55948804dab28a Author: Marius Brehler linux sungazer de> AuthorDate: Mon Nov 30 08:12:44 2015 +0000 Commit: Marius Brehler linux sungazer 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 +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 +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 }