diff options
| -rw-r--r-- | dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild (renamed from dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild) | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild index 451b66f7..2f086a09 100644 --- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild +++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild @@ -12,11 +12,16 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86" +# Does nothing now but by keeping it here we avoid having to have virtual/opencl +# handle ebuilds both with and without this flag. IUSE="+khronos-headers" BDEPEND="dev-lang/ruby:2.5 virtual/rubygems" -RDEPEND="app-eselect/eselect-opencl" +DEPEND="dev-util/opencl-headers" +RDEPEND="${DEPEND} + !app-eselect/eselect-opencl + !dev-libs/opencl-icd-loader" PATCHES=("${FILESDIR}"/${P}-gcc-10.patch) @@ -28,7 +33,9 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" econf --enable-pthread-once + # dev-util/opencl-headers ARE official Khronos Group headers, what this option + # does is disable the use of the bundled ones + ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers } multilib_src_install() { @@ -36,19 +43,4 @@ multilib_src_install() { # Drop .la files find "${ED}" -name '*.la' -delete || die - - OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd" - dodir ${OCL_DIR}/{,include} - - # Install vendor library - mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library" - - # Install vendor headers - if use khronos-headers; then - cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers" - fi -} - -pkg_postinst() { - eselect opencl set --use-old ${PN} } |