commit: 155622b15f0cfe50f2e04b00544b660e31cc66ae Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> AuthorDate: Mon Sep 21 18:02:36 2020 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Mon Sep 21 18:05:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155622b1
dev-util/intel-ocl-sdk: make pkgcheck happy Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> ...r2.ebuild => intel-ocl-sdk-4.4.0.117-r3.ebuild} | 30 ++++++++++++++-------- dev-util/intel-ocl-sdk/metadata.xml | 1 - 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild similarity index 71% rename from dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild rename to dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild index 9eaedd6076e..371f3e61ec9 100644 --- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild +++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit rpm multilib +inherit rpm DESCRIPTION="Intel's implementation of the OpenCL standard" HOMEPAGE="https://software.intel.com/en-us/articles/opencl-sdk/"; @@ -11,21 +11,30 @@ SRC_URI="https://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_app LICENSE="Intel-SDP" SLOT="0" -IUSE="android +system-tbb system-clang +system-boost" +IUSE="android +system-tbb +system-boost" KEYWORDS="-* amd64" RESTRICT="bindist mirror" RDEPEND=">=virtual/opencl-3 sys-process/numactl system-tbb? ( >=dev-cpp/tbb-4.2.20131118 ) - system-clang? ( =sys-devel/clang-3.4* ) system-boost? ( >=dev-libs/boost-1.52.0:= ) " DEPEND="" +PDEPEND=" + dev-libs/glib + media-libs/fontconfig + media-libs/freetype + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + sys-libs/zlib +" S=${WORKDIR}/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64/ INTEL_CL=opt/intel/opencl-1.2-${PV} -INTEL_VENDOR_DIR=usr/$(get_libdir)/OpenCL/vendors/intel/ QA_PREBUILT="${INTEL_OCL}/*" @@ -49,12 +58,10 @@ src_prepare() { if use system-boost; then rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libboost*.so* fi - if use system-clang; then - rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang* - fi if use system-tbb; then rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb* fi + default } src_install() { @@ -71,8 +78,9 @@ src_install() { # TODO put this somewhere # doins ${INTEL_CL}/eclipse-plug-in/OpenCL_SDK_0.1.0.jar + INTEL_VENDOR_DIR=usr/lib/OpenCL/vendors/intel/ dodir "${INTEL_VENDOR_DIR}" - dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so" "${INTEL_VENDOR_DIR}/libOpenCL.so" - dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1" "${INTEL_VENDOR_DIR}/libOpenCL.so.1" - dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2" + dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so" "${INTEL_VENDOR_DIR}/libOpenCL.so" + dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1" "${INTEL_VENDOR_DIR}/libOpenCL.so.1" + dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2" } diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml index 61f0f571848..dd498d74bb3 100644 --- a/dev-util/intel-ocl-sdk/metadata.xml +++ b/dev-util/intel-ocl-sdk/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="android">Install android related files</flag> <flag name="system-boost">Use system boost (dev-libs/boost) instead of bundled one</flag> - <flag name="system-clang">Use system clang (sys-devel/clang) instead of bundled one</flag> <flag name="system-tbb">Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag> </use> </pkgmetadata>
