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

["Justin Lecher" <jlec@gentoo.org>]

commit:     97dfec8c9a0539ceccbc8d62a109f485203eb94f
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Jun  6 09:07:18 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 09:07:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=97dfec8c

sci-libs/clblas: Fix installation of cmake configuration

Package-Manager: portage-2.2.18

 sci-libs/clblas/ChangeLog                          |  7 ++++++
 .../{clblas-2.4.ebuild => clblas-2.4-r1.ebuild}    |  1 +
 sci-libs/clblas/clblas-9999.ebuild                 |  1 +
 ...l-cmake-configuration-to-lib-cmake-clBLAS.patch | 25 ++++++++++++++++++++++
 4 files changed, 34 insertions(+)

diff --git a/sci-libs/clblas/ChangeLog b/sci-libs/clblas/ChangeLog
index 5ebd9c6..e6656f8 100644
--- a/sci-libs/clblas/ChangeLog
+++ b/sci-libs/clblas/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*clblas-2.4-r1 (06 Jun 2015)
+
+  06 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> +clblas-2.4-r1.ebuild,
+  +files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch,
+  -clblas-2.4.ebuild, clblas-9999.ebuild:
+  sci-libs/clblas: Fix installation of cmake configuration
+
   06 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> -clblas-2.2.ebuild,
   -files/clblas-2.2-client_CMakeLists.patch,
   -files/clblas-2.2-library_tools_tune_CMakeLists.patch:

diff --git a/sci-libs/clblas/clblas-2.4.ebuild b/sci-libs/clblas/clblas-2.4-r1.ebuild
similarity index 95%
rename from sci-libs/clblas/clblas-2.4.ebuild
rename to sci-libs/clblas/clblas-2.4-r1.ebuild
index 945a9a4..00133c2 100644
--- a/sci-libs/clblas/clblas-2.4.ebuild
+++ b/sci-libs/clblas/clblas-2.4-r1.ebuild
@@ -40,6 +40,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/clblas-samples_CMakeLists.patch
 	"${FILESDIR}"/clblas-scripts_perf_CMakeLists.patch
+	"${FILESDIR}"/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch
 )
 
 pkg_pretend() {

diff --git a/sci-libs/clblas/clblas-9999.ebuild b/sci-libs/clblas/clblas-9999.ebuild
index 8850929..bb47c0d 100644
--- a/sci-libs/clblas/clblas-9999.ebuild
+++ b/sci-libs/clblas/clblas-9999.ebuild
@@ -39,6 +39,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/clblas-samples_CMakeLists.patch
 	"${FILESDIR}"/clblas-scripts_perf_CMakeLists.patch
+	"${FILESDIR}"/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch
 )
 
 pkg_pretend() {

diff --git a/sci-libs/clblas/files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch b/sci-libs/clblas/files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch
new file mode 100644
index 0000000..32cb7b5
--- /dev/null
+++ b/sci-libs/clblas/files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch
@@ -0,0 +1,25 @@
+From b83750ab917b12500f9755dc4c81f99eb55bb67e Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.brehler@tu-dortmund.de>
+Date: Sat, 6 Jun 2015 10:35:32 +0200
+Subject: [PATCH] Install cmake configuration to lib/cmake/clBLAS
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a23cd37..5c378dc 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -300,7 +300,7 @@ endif( )
+ if(WIN32)
+   set(destdir CMake)
+ else()
+-  set(destdir share/clBLAS)
++  set(destdir lib${SUFFIX_LIB}/cmake/clBLAS)
+ endif()
+ string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
+ configure_file(
+-- 
+2.3.6
+