Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/
Date: Fri, 31 Aug 2018 13:08:07
Message-Id: 1535720875.ac97e59f85ca6a8b87ac7ebbe50b53630731402e.marecki@gentoo
1 commit: ac97e59f85ca6a8b87ac7ebbe50b53630731402e
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 31 13:07:36 2018 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 31 13:07:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac97e59f
7
8 dev-libs/beignet: fix broken prefix support
9
10 With VENDOR_DIR as set in the ebuild beginning with a slash,
11 ${EPREFIX%/}/${VENDOR_DIR} ends up containing // regardless of the
12 value of EPREFIX. On a less serious note, it isn't necessary to strip
13 the trailing slash from EPREFIX because according to specifications
14 there shouldn't be one; it seems the author of the patch confused it
15 with e.g. ED.
16
17 Closes: https://bugs.gentoo.org/663818
18 Package-Manager: Portage-2.3.40, Repoman-2.3.9
19
20 dev-libs/beignet/beignet-1.3.2-r1.ebuild | 4 ++--
21 1 file changed, 2 insertions(+), 2 deletions(-)
22
23 diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
24 index 7975dc31d3c..aabc386a74b 100644
25 --- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
26 +++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
27 @@ -82,7 +82,7 @@ multilib_src_configure() {
28 VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
29
30 local mycmakeargs=(
31 - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/${VENDOR_DIR}"
32 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
33 -DOCLICD_COMPAT=$(usex ocl-icd)
34 $(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
35 )
36 @@ -96,7 +96,7 @@ multilib_src_install() {
37 cmake-utils_src_install
38
39 insinto /etc/OpenCL/vendors/
40 - echo "${EPREFIX%/}/${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
41 + echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
42 doins "${PN}-${ABI}.icd"
43
44 dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1