From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1044735-garchives=archives.gentoo.org@lists.gentoo.org>
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 CCCE4138334
for <garchives@archives.gentoo.org>; Fri, 31 Aug 2018 13:08:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DB61DE087F;
Fri, 31 Aug 2018 13:08:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B59F2E087F
for <gentoo-commits@lists.gentoo.org>; Fri, 31 Aug 2018 13:08:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5365B335C42
for <gentoo-commits@lists.gentoo.org>; Fri, 31 Aug 2018 13:08:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 190B13A7
for <gentoo-commits@lists.gentoo.org>; Fri, 31 Aug 2018 13:08:03 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1535720875.ac97e59f85ca6a8b87ac7ebbe50b53630731402e.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/beignet/beignet-1.3.2-r1.ebuild
X-VCS-Directories: dev-libs/beignet/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: ac97e59f85ca6a8b87ac7ebbe50b53630731402e
X-VCS-Branch: master
Date: Fri, 31 Aug 2018 13:08:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 29688179-1181-44b5-bdb6-fe8596de6e9f
X-Archives-Hash: 56593451c9997b219c053c1902429ab1
commit: ac97e59f85ca6a8b87ac7ebbe50b53630731402e
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 13:07:36 2018 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 13:07:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac97e59f
dev-libs/beignet: fix broken prefix support
With VENDOR_DIR as set in the ebuild beginning with a slash,
${EPREFIX%/}/${VENDOR_DIR} ends up containing // regardless of the
value of EPREFIX. On a less serious note, it isn't necessary to strip
the trailing slash from EPREFIX because according to specifications
there shouldn't be one; it seems the author of the patch confused it
with e.g. ED.
Closes: https://bugs.gentoo.org/663818
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-libs/beignet/beignet-1.3.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index 7975dc31d3c..aabc386a74b 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -82,7 +82,7 @@ multilib_src_configure() {
VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/${VENDOR_DIR}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
-DOCLICD_COMPAT=$(usex ocl-icd)
$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
)
@@ -96,7 +96,7 @@ multilib_src_install() {
cmake-utils_src_install
insinto /etc/OpenCL/vendors/
- echo "${EPREFIX%/}/${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+ echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
doins "${PN}-${ABI}.icd"
dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1