[gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/

[Conrad Kostecki]

commit:     0d4f19d02396b2449a59b1fd57201fcdaa44a7ad
Author:     Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
AuthorDate: Thu Feb 18 14:08:04 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 14:39:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d4f19d0

dev-libs/opencl-clang: Add support for llvm 11.1

Signed-off-by: Mike Lothian <mike <AT> fireburn.co.uk>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-libs/opencl-clang/files/llvm-11.1.0.patch      | 11 ++++++
 .../opencl-clang/opencl-clang-11.0.0-r1.ebuild     | 44 ++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/dev-libs/opencl-clang/files/llvm-11.1.0.patch 
b/dev-libs/opencl-clang/files/llvm-11.1.0.patch
new file mode 100644
index 00000000000..cd9cb0c2813
--- /dev/null
+++ b/dev-libs/opencl-clang/files/llvm-11.1.0.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt   2021-02-18 14:52:20.079691789 +0000
++++ b/CMakeLists.txt   2021-02-18 14:47:43.773873042 +0000
+@@ -20,7 +20,7 @@
+     add_definitions(-DUSE_PREBUILT_LLVM)
+ 
+     if(NOT PREFERRED_LLVM_VERSION)
+-        set(PREFERRED_LLVM_VERSION "11.0.0")
++        set(PREFERRED_LLVM_VERSION "11.1.0")
+     endif(NOT PREFERRED_LLVM_VERSION)
+     message(STATUS "Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
+     find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)

diff --git a/dev-libs/opencl-clang/opencl-clang-11.0.0-r1.ebuild 
b/dev-libs/opencl-clang/opencl-clang-11.0.0-r1.ebuild
new file mode 100644
index 00000000000..7b4a21d88d1
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-11.0.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang";
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="11"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+# Force a rebuild of this package once clang has been updated from 10.0.0 to 
10.0.1
+# in order to work around Bug #743992. Hopefully a one-time thing.
+DEPEND="~sys-devel/clang-11.1.0:11=[static-analyzer,${MULTILIB_USEDEP}]
+       ~sys-devel/llvm-11.1.0:11=[${MULTILIB_USEDEP}]
+       >=dev-util/spirv-llvm-translator-11.0.0:11=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=11
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+       "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+       "${FILESDIR}"/llvm-11.1.0.patch
+)
+
+multilib_src_configure() {
+       local mycmakeargs=(
+               -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+               -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+       )
+       cmake_src_configure
+}