public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/clblas/
Date: Thu, 26 Jan 2017 19:40:41 +0000 (UTC)	[thread overview]
Message-ID: <1485459635.c6e174240bd956a16b04f89328e53630f066fc14.mmokrejs@gentoo> (raw)

commit:     c6e174240bd956a16b04f89328e53630f066fc14
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Thu Jan 26 19:40:35 2017 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Thu Jan 26 19:40:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c6e17424

sci-libs/clblas: apply previous fix also to the other ebuilds

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/clblas/clblas-2.8.ebuild  | 11 ++++++-----
 sci-libs/clblas/clblas-9999.ebuild | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sci-libs/clblas/clblas-2.8.ebuild b/sci-libs/clblas/clblas-2.8.ebuild
index d37fe5d..2cbb911 100644
--- a/sci-libs/clblas/clblas-2.8.ebuild
+++ b/sci-libs/clblas/clblas-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -46,14 +46,15 @@ pkg_pretend() {
 		fi
 	fi
 
-	if [ ! -d "/usr/local/include/CL" ]; then
+	if [ ! -d "${EPREFIX}/usr/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 "headers, normally provided by the eselect-opencl package, can be"
+		eerror "manually created with"
 		eerror ""
-		eerror "  ln -s /usr/lib64/OpenCL/global/include/CL-1.2/ /usr/local/include/CL"
+		eerror "  ln -s ${EPREFIX}/usr/lib64/OpenCL/global/include/CL-1.2/ ${EPREFIX}/usr/include/CL"
 		eerror ""
-		die "/usr/local/include/CL not found"
+		die "${EPREFIX}/usr/include/CL not found"
 	fi
 }
 

diff --git a/sci-libs/clblas/clblas-9999.ebuild b/sci-libs/clblas/clblas-9999.ebuild
index 3a663af..f5fc36e 100644
--- a/sci-libs/clblas/clblas-9999.ebuild
+++ b/sci-libs/clblas/clblas-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -46,14 +46,15 @@ pkg_pretend() {
 		fi
 	fi
 
-	if [ ! -d "/usr/local/include/CL" ]; then
+	if [ ! -d "${EPREFIX}/usr/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 "headers, normally provided by the eselect-opencl package, can be"
+		eerror "manually created with"
 		eerror ""
-		eerror "  ln -s /usr/lib64/OpenCL/global/include/CL-1.2/ /usr/local/include/CL"
+		eerror "  ln -s ${EPREFIX}/usr/lib64/OpenCL/global/include/CL-1.2/ ${EPREFIX}/usr/include/CL"
 		eerror ""
-		die "/usr/local/include/CL not found"
+		die "${EPREFIX}/usr/include/CL not found"
 	fi
 }
 


             reply	other threads:[~2017-01-26 19:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-26 19:40 Martin Mokrejs [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-22 12:14 [gentoo-commits] proj/sci:master commit in: sci-libs/clblas/ Aisha Tammy
2017-09-02 11:39 David Seifert
2017-01-26 19:40 Martin Mokrejs
2016-05-21  9:32 Marius Brehler
2016-04-25  8:52 Marius Brehler
2016-01-21  8:20 Marius Brehler
2015-11-30  8:13 Marius Brehler
2015-11-30  8:13 Marius Brehler
2015-09-13 18:34 Justin Lecher
2015-06-06  9:46 Justin Lecher
2015-06-06  9:46 Justin Lecher
2015-06-05 11:20 Justin Lecher
2015-06-05 11:20 Justin Lecher
2015-05-12 11:18 Justin Lecher
2015-05-12 11:18 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1485459635.c6e174240bd956a16b04f89328e53630f066fc14.mmokrejs@gentoo \
    --to=mmokrejs@fold.natur.cuni.cz \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox