Gentoo Archives: gentoo-commits

From: Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/clblas/
Date: Thu, 26 Jan 2017 19:40:47
Message-Id: 1485459635.c6e174240bd956a16b04f89328e53630f066fc14.mmokrejs@gentoo
1 commit: c6e174240bd956a16b04f89328e53630f066fc14
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Thu Jan 26 19:40:35 2017 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Thu Jan 26 19:40:35 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c6e17424
7
8 sci-libs/clblas: apply previous fix also to the other ebuilds
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 sci-libs/clblas/clblas-2.8.ebuild | 11 ++++++-----
13 sci-libs/clblas/clblas-9999.ebuild | 11 ++++++-----
14 2 files changed, 12 insertions(+), 10 deletions(-)
15
16 diff --git a/sci-libs/clblas/clblas-2.8.ebuild b/sci-libs/clblas/clblas-2.8.ebuild
17 index d37fe5d..2cbb911 100644
18 --- a/sci-libs/clblas/clblas-2.8.ebuild
19 +++ b/sci-libs/clblas/clblas-2.8.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2016 Gentoo Foundation
22 +# Copyright 1999-2017 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Id$
25
26 @@ -46,14 +46,15 @@ pkg_pretend() {
27 fi
28 fi
29
30 - if [ ! -d "/usr/local/include/CL" ]; then
31 + if [ ! -d "${EPREFIX}/usr/include/CL" ]; then
32 eerror "As a temporary workaround for Bug #521734, a symlink pointing to"
33 eerror "OpenCL headers >= 1.2 is needed. A symlink pointing to the CL-1.2"
34 - eerror "headers, provided by the eselect-opencl package, can be created with"
35 + eerror "headers, normally provided by the eselect-opencl package, can be"
36 + eerror "manually created with"
37 eerror ""
38 - eerror " ln -s /usr/lib64/OpenCL/global/include/CL-1.2/ /usr/local/include/CL"
39 + eerror " ln -s ${EPREFIX}/usr/lib64/OpenCL/global/include/CL-1.2/ ${EPREFIX}/usr/include/CL"
40 eerror ""
41 - die "/usr/local/include/CL not found"
42 + die "${EPREFIX}/usr/include/CL not found"
43 fi
44 }
45
46
47 diff --git a/sci-libs/clblas/clblas-9999.ebuild b/sci-libs/clblas/clblas-9999.ebuild
48 index 3a663af..f5fc36e 100644
49 --- a/sci-libs/clblas/clblas-9999.ebuild
50 +++ b/sci-libs/clblas/clblas-9999.ebuild
51 @@ -1,4 +1,4 @@
52 -# Copyright 1999-2016 Gentoo Foundation
53 +# Copyright 1999-2017 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Id$
56
57 @@ -46,14 +46,15 @@ pkg_pretend() {
58 fi
59 fi
60
61 - if [ ! -d "/usr/local/include/CL" ]; then
62 + if [ ! -d "${EPREFIX}/usr/include/CL" ]; then
63 eerror "As a temporary workaround for Bug #521734, a symlink pointing to"
64 eerror "OpenCL headers >= 1.2 is needed. A symlink pointing to the CL-1.2"
65 - eerror "headers, provided by the eselect-opencl package, can be created with"
66 + eerror "headers, normally provided by the eselect-opencl package, can be"
67 + eerror "manually created with"
68 eerror ""
69 - eerror " ln -s /usr/lib64/OpenCL/global/include/CL-1.2/ /usr/local/include/CL"
70 + eerror " ln -s ${EPREFIX}/usr/lib64/OpenCL/global/include/CL-1.2/ ${EPREFIX}/usr/include/CL"
71 eerror ""
72 - die "/usr/local/include/CL not found"
73 + die "${EPREFIX}/usr/include/CL not found"
74 fi
75 }