* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
@ 2019-05-01 16:52 Marek Szuba
0 siblings, 0 replies; 8+ messages in thread
From: Marek Szuba @ 2019-05-01 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 121db0b1f43098fa534d213c285d844dbd7ab2b0
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 11:29:31 2019 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed May 1 16:51:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121db0b1
dev-libs/opencl-clang: new package
Second-order dependency of Intel Graphics Compute Runtime.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-libs/opencl-clang/Manifest | 1 +
.../opencl-clang-8.0.0-clang_library_dir.patch | 11 +++++++
dev-libs/opencl-clang/metadata.xml | 12 ++++++++
dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild | 34 ++++++++++++++++++++++
4 files changed, 58 insertions(+)
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
new file mode 100644
index 00000000000..4073b5140ae
--- /dev/null
+++ b/dev-libs/opencl-clang/Manifest
@@ -0,0 +1 @@
+DIST opencl-clang-8.0.0.tar.gz 40789 BLAKE2B baa559e90bf7f57cc59942c279b0488e306c7fd481582b213707d1cf0382f717965cd0fc7278e9c5a359847cead097243509a0730cd38f70fbbb2586c3145265 SHA512 4a353e2b28d54671be0eea00536c05093d358dec9950ea5b0732c8f46dd03bc29884487fb88f762f2c20311b928496c3b5729a8c6a72a7ce9caf30b23895340f
diff --git a/dev-libs/opencl-clang/files/opencl-clang-8.0.0-clang_library_dir.patch b/dev-libs/opencl-clang/files/opencl-clang-8.0.0-clang_library_dir.patch
new file mode 100644
index 00000000000..54ca2510004
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-8.0.0-clang_library_dir.patch
@@ -0,0 +1,11 @@
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -13,7 +13,7 @@
+
+ if(USE_PREBUILT_LLVM)
+ set(OPENCL_HEADERS_DIR
+- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
++ "${CLANG_LIBRARY_DIRS}/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
+ else(USE_PREBUILT_LLVM)
+ set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers")
+ endif(USE_PREBUILT_LLVM)
diff --git a/dev-libs/opencl-clang/metadata.xml b/dev-libs/opencl-clang/metadata.xml
new file mode 100644
index 00000000000..b4f521584bb
--- /dev/null
+++ b/dev-libs/opencl-clang/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">intel/opencl-clang</remote-id>
+ </upstream>
+</pkgmetadata>
+
diff --git a/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild
new file mode 100644
index 00000000000..119d5523a02
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="8"
+KEYWORDS="~amd64"
+
+COMMON="sys-devel/clang:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+ dev-util/spirv-llvm-translator:8=[${MULTILIB_USEDEP}]
+ dev-vcs/git"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+ -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
@ 2020-06-22 20:57 Marek Szuba
0 siblings, 0 replies; 8+ messages in thread
From: Marek Szuba @ 2020-06-22 20:57 UTC (permalink / raw
To: gentoo-commits
commit: 955640ef357de349e242eca5d7848286a450f35e
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 20:45:03 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 20:55:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=955640ef
dev-libs/opencl-clang:10: Fix llvm-tblgen detection
Upstream CMake scripts simply set LLVM_TABLEGEN_EXE to "llvm-tblgen".
This works fine for 32-bit builds of SLOT=8 and 9 as well as 64-bit
builds of all three slots, however 32-bit builds of SLOT=10 fail due to
having been unable to locate the executable in question. Whatever the
reason for this is, actually looking for llvm-tblgen with
find_program() solves the issue, at least on my system anyway.
Closes: https://bugs.gentoo.org/728804
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch | 11 +++++++++++
dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch b/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch
new file mode 100644
index 00000000000..bf013c33a59
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,7 +137,7 @@
+ set (COMPILE_OPTIONS_TD opencl_clang_options.td)
+ set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
+
+-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
++find_program(LLVM_TABLEGEN_EXE "llvm-tblgen")
+ set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
+ if(USE_PREBUILT_LLVM)
+ set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
index d09e936af38..eaa015b40fe 100644
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
@@ -29,6 +29,7 @@ LLVM_MAX_SLOT=10
PATCHES=(
"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+ "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
)
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
@ 2021-02-27 14:39 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2021-02-27 14:39 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
@ 2021-02-27 14:42 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2021-02-27 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 395c374cc45a22367320c704400fb649d532492d
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 14:41:41 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 14:42:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395c374c
Revert "dev-libs/opencl-clang: Add support for llvm 11.1"
This reverts commit 0d4f19d02396b2449a59b1fd57201fcdaa44a7ad.
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 deletions(-)
diff --git a/dev-libs/opencl-clang/files/llvm-11.1.0.patch b/dev-libs/opencl-clang/files/llvm-11.1.0.patch
deleted file mode 100644
index cd9cb0c2813..00000000000
--- a/dev-libs/opencl-clang/files/llvm-11.1.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 7b4a21d88d1..00000000000
--- a/dev-libs/opencl-clang/opencl-clang-11.0.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
@ 2022-01-21 7:08 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-01-21 7:08 UTC (permalink / raw
To: gentoo-commits
commit: cedb362f8b9bae5ab0c1e4420618d605a675d978
Author: Janusz Andrzejewski <janusz.andrzejewski <AT> gmail <DOT> com>
AuthorDate: Thu Dec 30 21:41:13 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 06:51:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cedb362f
dev-libs/opencl-clang: ver 13.0.0
Simple update for compiling with llvm 13
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Janusz Andrzejewski <janusz.andrzejewski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23593
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/opencl-clang/Manifest | 1 +
.../files/opencl-clang-13.0.0_version.patch | 11 ++++++
dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild | 40 ++++++++++++++++++++++
3 files changed, 52 insertions(+)
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index f0aff210ef63..d66790347665 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,2 +1,3 @@
DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
+DIST opencl-clang-13.0.0.tar.gz 25299 BLAKE2B 1aabb4a97ba0bfd6129ea2b821508457de9d8ab78b4456217d655239081f8547e87730f54f05511e1a3ca6c54836fad5cb0cf69f26ac5ffd86ff6ae930f5e2dc SHA512 d346e51339060795d80bdf9d3e3b58e55b089d94ed3c0bc3c7e1e8f81a5f65238d90dacc95ec27e8db7d38a6a03b05df5c4120e9ba0ec72a7bbca28a59d697f7
diff --git a/dev-libs/opencl-clang/files/opencl-clang-13.0.0_version.patch b/dev-libs/opencl-clang/files/opencl-clang-13.0.0_version.patch
new file mode 100644
index 000000000000..1664960b6608
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-13.0.0_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ add_definitions(-DUSE_PREBUILT_LLVM)
+
+ if(NOT PREFERRED_LLVM_VERSION)
+- set(PREFERRED_LLVM_VERSION "12.0.0")
++ set(PREFERRED_LLVM_VERSION "13.0.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-13.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild
new file mode 100644
index 000000000000..1c05a54ecb8e
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="13"
+KEYWORDS="~amd64"
+
+DEPEND="
+ >=dev-util/spirv-llvm-translator-13.0.0:13=[${MULTILIB_USEDEP}]
+ >=sys-devel/clang-13.0.0:13=[static-analyzer,${MULTILIB_USEDEP}]
+ sys-devel/llvm:13=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=13
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+ "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+ "${FILESDIR}"/${PN}-13.0.0_version.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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
@ 2022-04-24 14:41 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2022-04-24 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 614cbbec27931cb935df7b0bf3f773d59b7ce3d2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 13:35:02 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 14:40:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614cbbec
dev-libs/opencl-clang: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/opencl-clang/Manifest | 1 -
.../files/opencl-clang-11.1.0_version.patch | 11 ------
.../opencl-clang-11.1.0_pre20201222.ebuild | 46 ----------------------
3 files changed, 58 deletions(-)
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index d66790347665..d1c7f446ecd8 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,3 +1,2 @@
-DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
DIST opencl-clang-13.0.0.tar.gz 25299 BLAKE2B 1aabb4a97ba0bfd6129ea2b821508457de9d8ab78b4456217d655239081f8547e87730f54f05511e1a3ca6c54836fad5cb0cf69f26ac5ffd86ff6ae930f5e2dc SHA512 d346e51339060795d80bdf9d3e3b58e55b089d94ed3c0bc3c7e1e8f81a5f65238d90dacc95ec27e8db7d38a6a03b05df5c4120e9ba0ec72a7bbca28a59d697f7
diff --git a/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch b/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch
deleted file mode 100644
index 6df90f21a059..000000000000
--- a/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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.1.0_pre20201222.ebuild b/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild
deleted file mode 100644
index 80403ddf333c..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="c67648d41df00ea8ee9d701d17299b86f86f0321"
-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/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="UoI-NCSA"
-SLOT="11"
-KEYWORDS="amd64"
-
-# 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="
- >=dev-util/spirv-llvm-translator-11.0.0:11=[${MULTILIB_USEDEP}]
- ~sys-devel/clang-11.1.0:11=[static-analyzer,${MULTILIB_USEDEP}]
- sys-devel/llvm: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}"/${PN}-11.1.0_version.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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
@ 2023-05-04 21:49 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2023-05-04 21:49 UTC (permalink / raw
To: gentoo-commits
commit: d587eef9baa0bff2161ea2aae5b5b122f85c8a1e
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu May 4 21:47:56 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu May 4 21:47:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d587eef9
dev-libs/opencl-clang: add 16.0.0
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-libs/opencl-clang/Manifest | 1 +
.../opencl-clang-16.0.0-clang_library_dir.patch | 36 +++++++++++++++++++
.../files/opencl-clang-16.0.0-cxx17.patch | 23 ++++++++++++
.../files/opencl-clang-16.0.0-llvm.patch | 40 +++++++++++++++++++++
.../opencl-clang-16.0.0-standalone-build.patch | 26 ++++++++++++++
dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild | 42 ++++++++++++++++++++++
6 files changed, 168 insertions(+)
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 4f4bdc9262d1..adacd90a7844 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,2 +1,3 @@
DIST opencl-clang-14.0.0.tar.gz 26109 BLAKE2B 2ae5e6d69e2f13b867712d03b52fce893aeb70566f7f97d54858639786276f49b0b6b5768aebfedeb7fe50d95511178d7dd9df7e80d3fd27df1fb3fe1d2ab955 SHA512 ab9a3fd40542283bdd2646d9ef8d3217420c82a41b183d705e48f48949505ecadc1fa435e23a7ceadf5a335200f5f3752b42715e2ac7f63173fc09637c5c609a
DIST opencl-clang-15.0.0.tar.gz 26212 BLAKE2B 02d3a8eb3964b6882bd94b676b4459412c753ac38e1e3012662021e98a8219225eaf6af4f62f4e0e97de428f55b0b698374dc39babff09a0fcc73213d5daacfe SHA512 a2ffce43493793524e9512be2e7bd46c0183b86b35a6f79018d355d07a83303a944e6dacebfb768e88ce75a7020a44939be872a2d4e754544198a9829f4febd4
+DIST opencl-clang-16.0.0.tar.gz 28413 BLAKE2B c99f043171186f5d9e44618d5d637d6a5c7997f22577491f544e78d93edd5afe74ba88eaaea92a931dd87af71fb630fdf03d27f1a9f55d7c3b8bdf53dee54b07 SHA512 bf723edab7dc7a028eb79d01fd2306690a2169472760bf2783d593ffec4eb788f28f184c66b204cc074cb95a4149fcc63a1dcbee5563c620a9dc2c76bb5a2d5a
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch
new file mode 100644
index 000000000000..227a7be30b50
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch
@@ -0,0 +1,36 @@
+From 9f50367661bb6345bf7b18102f1e415378afda06 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com>
+Date: Fri, 21 Apr 2023 04:08:11 +0200
+Subject: [PATCH] Support llvm headers in
+ ${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/ (#419)
+
+Fedora places llvm include files into that directory instead of assumed
+${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/
+
+Try both, fail horribly when none of them exist
+---
+ cl_headers/CMakeLists.txt | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 86df76f..0223d52 100644
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -19,8 +19,15 @@ add_custom_command(
+ endfunction(copy_file)
+
+ if(USE_PREBUILT_LLVM)
+- set(OPENCL_HEADERS_DIR
+- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
++ if(EXISTS "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/")
++ set(OPENCL_HEADERS_DIR
++ "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
++ elseif(EXISTS "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/")
++ set(OPENCL_HEADERS_DIR
++ "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/include/")
++ else()
++ message(FATAL_ERROR "[OPENCL-CLANG] Couldn't find prebuilt LLVM include directory.")
++ endif()
+ else(USE_PREBUILT_LLVM)
+ set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers")
+ endif(USE_PREBUILT_LLVM)
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch
new file mode 100644
index 000000000000..aa6c308630e8
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch
@@ -0,0 +1,23 @@
+From 5491ffa3fde5729074fe804023bd279c56684f77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com>
+Date: Mon, 24 Apr 2023 10:29:36 +0200
+Subject: [PATCH] Bump CMAKE_CXX_STANDARD to 17 (#416)
+
+Fixes build issues
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc471d8..a7d1927 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,7 +58,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+ ${CMAKE_MODULE_PATH}
+ ${LLVM_CMAKE_DIR})
+
+- set(CMAKE_CXX_STANDARD 14)
++ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+ option(LLVMSPIRV_INCLUDED_IN_LLVM
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch
new file mode 100644
index 000000000000..67759595b353
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch
@@ -0,0 +1,40 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -335,36 +335,7 @@
+ target_link_libraries( ${TARGET_NAME}
+ LINK_PRIVATE
+ ${OPENCL_CLANG_LINK_LIBS}
+- LLVMX86CodeGen
+- LLVMX86AsmParser
+- LLVMX86Desc
+- LLVMX86Info
+- LLVMX86Disassembler
+- LLVMAnalysis
+- LLVMCodeGen
+- LLVMCore
+- LLVMipo
+- LLVMInstCombine
+- LLVMInstrumentation
+- LLVMMC
+- LLVMMCParser
+- LLVMObjCARCOpts
+- LLVMOption
+- LLVMScalarOpts
+- LLVMSupport
+- LLVMTransformUtils
+- LLVMVectorize
+- LLVMAsmPrinter
+- LLVMSelectionDAG
+- LLVMMCDisassembler
+- LLVMProfileData
+- LLVMObject
+- LLVMBitWriter
+- LLVMIRReader
+- LLVMAsmParser
+- LLVMTarget
+- LLVMBitReader
+- ${OTHER_LIBRARIES}
++ LLVM
+ )
+
+ install(FILES opencl_clang.h
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch
new file mode 100644
index 000000000000..a85ec58df401
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch
@@ -0,0 +1,26 @@
+From 529a9188114bcbd8ed753d2276942384fa50d7a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com>
+Date: Fri, 21 Apr 2023 04:07:21 +0200
+Subject: [PATCH] Fix standalone build (#415)
+
+Fixes https://github.com/intel/opencl-clang/issues/406
+Fixes https://github.com/intel/opencl-clang/issues/374
+---
+ cl_headers/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 788adff..86df76f 100644
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ set(CL_HEADERS_LIB cl_headers)
+-set(CLANG_COMMAND $<TARGET_FILE:clang> )
++if(USE_PREBUILT_LLVM)
++ find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
++else()
++ set(CLANG_COMMAND $<TARGET_FILE:clang>)
++endif()
+ if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
+ build_native_tool(clang CLANG_COMMAND)
+ endif()
diff --git a/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild
new file mode 100644
index 000000000000..b902e1ab200f
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT="16"
+
+inherit cmake llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-util/spirv-llvm-translator:${SLOT}=
+ sys-devel/clang:${SLOT}=[static-analyzer]
+ sys-devel/llvm:${SLOT}=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-16.0.0-clang_library_dir.patch
+ "${FILESDIR}"/${PN}-16.0.0-cxx17.patch
+ "${FILESDIR}"/${PN}-16.0.0-llvm.patch
+ "${FILESDIR}"/${PN}-16.0.0-standalone-build.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -Wno-dev
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
@ 2024-03-10 13:25 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2024-03-10 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 6930798a87988c793d683b5e0add5b6b55679093
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 13:13:41 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 13:24:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6930798a
dev-libs/opencl-clang: add 17.0.0
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-libs/opencl-clang/Manifest | 1 +
.../opencl-clang-17.0.0-clang_library_dir.patch | 19 ++++++++++
dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild | 42 ++++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 7fbde491ca25..50ef0f399661 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,2 +1,3 @@
DIST opencl-clang-15.0.0.tar.gz 26212 BLAKE2B 02d3a8eb3964b6882bd94b676b4459412c753ac38e1e3012662021e98a8219225eaf6af4f62f4e0e97de428f55b0b698374dc39babff09a0fcc73213d5daacfe SHA512 a2ffce43493793524e9512be2e7bd46c0183b86b35a6f79018d355d07a83303a944e6dacebfb768e88ce75a7020a44939be872a2d4e754544198a9829f4febd4
DIST opencl-clang-16.0.0.tar.gz 28413 BLAKE2B c99f043171186f5d9e44618d5d637d6a5c7997f22577491f544e78d93edd5afe74ba88eaaea92a931dd87af71fb630fdf03d27f1a9f55d7c3b8bdf53dee54b07 SHA512 bf723edab7dc7a028eb79d01fd2306690a2169472760bf2783d593ffec4eb788f28f184c66b204cc074cb95a4149fcc63a1dcbee5563c620a9dc2c76bb5a2d5a
+DIST opencl-clang-17.0.0.tar.gz 28436 BLAKE2B dd86255e757d290fb0417d966098ad00ceb0440c83fa79d8bdaadc7ee9964b13810d27f93740f4b00b9c0e16e5c9b29213800d98042b6c211b45a9cd1402f038 SHA512 920e19c9c36fef1752bce46a1a240bfc0cdd22c09e5840520508c67ecd965524f5c1ce04d8879af146670377f758d3f457a8263338b84b6833e8916f10566698
diff --git a/dev-libs/opencl-clang/files/opencl-clang-17.0.0-clang_library_dir.patch b/dev-libs/opencl-clang/files/opencl-clang-17.0.0-clang_library_dir.patch
new file mode 100644
index 000000000000..dd72e7210410
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-17.0.0-clang_library_dir.patch
@@ -0,0 +1,19 @@
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -19,12 +19,12 @@
+ endfunction(copy_file)
+
+ if(USE_PREBUILT_LLVM)
+- if(EXISTS "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/")
++ if(EXISTS "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/")
+ set(OPENCL_HEADERS_DIR
+- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
+- elseif(EXISTS "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/")
++ "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
++ elseif(EXISTS "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/")
+ set(OPENCL_HEADERS_DIR
+- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/include/")
++ "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/include/")
+ else()
+ message(FATAL_ERROR "[OPENCL-CLANG] Couldn't find prebuilt LLVM include directory.")
+ endif()
diff --git a/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild
new file mode 100644
index 000000000000..65dcb960a1bd
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-17.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 17 )
+
+inherit cmake llvm-r1
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+ dev-util/spirv-llvm-translator:${SLOT}=
+ $(llvm_gen_dep '
+ sys-devel/clang:${LLVM_SLOT}=[static-analyzer]
+ sys-devel/llvm:${LLVM_SLOT}=
+ ')
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+ -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+ -DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+ -DPREFERRED_LLVM_VERSION="${LLVM_SLOT}"
+ -DUSE_PREBUILT_LLVM="ON"
+ -Wno-dev
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-03-10 13:25 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-24 14:41 [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-03-10 13:25 Conrad Kostecki
2023-05-04 21:49 Conrad Kostecki
2022-01-21 7:08 Joonas Niilola
2021-02-27 14:42 Conrad Kostecki
2021-02-27 14:39 Conrad Kostecki
2020-06-22 20:57 Marek Szuba
2019-05-01 16:52 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox