summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2018-08-31 14:07:36 +0100
committerMarek Szuba <marecki@gentoo.org>2018-08-31 14:07:55 +0100
commitac97e59f85ca6a8b87ac7ebbe50b53630731402e (patch)
treebf15cc9631f84f79c3bd58677d2fedfaa27addcc /dev-libs
parentmedia-plugins/vdr-permashift: eapi 7; cleanup old (diff)
downloadgentoo-ac97e59f85ca6a8b87ac7ebbe50b53630731402e.tar.gz
gentoo-ac97e59f85ca6a8b87ac7ebbe50b53630731402e.tar.bz2
gentoo-ac97e59f85ca6a8b87ac7ebbe50b53630731402e.zip
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
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/beignet/beignet-1.3.2-r1.ebuild4
1 files 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