From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5334413908F for ; Thu, 26 Jan 2017 19:40:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28DC323401F; Thu, 26 Jan 2017 19:40:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA32F23401F for ; Thu, 26 Jan 2017 19:40:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5524B34163E for ; Thu, 26 Jan 2017 19:40:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B995A30A3 for ; Thu, 26 Jan 2017 19:40:41 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" Message-ID: <1485459635.c6e174240bd956a16b04f89328e53630f066fc14.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/clblas/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/clblas/clblas-2.8.ebuild sci-libs/clblas/clblas-9999.ebuild X-VCS-Directories: sci-libs/clblas/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: c6e174240bd956a16b04f89328e53630f066fc14 X-VCS-Branch: master Date: Thu, 26 Jan 2017 19:40:41 +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: d04db8a8-2f0d-444e-9191-81c0049da1b2 X-Archives-Hash: bee0a70fe8faff1ad4126b6295f24b22 commit: c6e174240bd956a16b04f89328e53630f066fc14 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Thu Jan 26 19:40:35 2017 +0000 Commit: Martin Mokrejs fold natur cuni 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 }