[gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/files/, dev-libs/opencl-clang/
commit: 09b1fff61dab3c13a6f38ba3645ff606a4c317a2
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed Jul 26 21:20:15 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Jul 26 21:23:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b1fff6
dev-libs/opencl-clang: fix so install
Closes: https://bugs.gentoo.org/909399
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/opencl-clang-16.0.0-llvm.patch | 79 --
...16.0.0.ebuild => opencl-clang-16.0.0-r1.ebuild} | 0
2 files changed, 72 insertions(+), 7 deletions(-)
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
index 67759595b353..659a2b90bf6c 100644
--- 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
@@ -1,9 +1,73 @@
+commit e047ae6bb9cef488781e0b06c5ae9018bacb24c4
+Author: Wenju He
+Date: Thu May 18 16:01:52 2023 +0800
+
+Revert to use add_llvm_library and revert linking LLVM libraries (#438)
+
+Add cmake option EXCLUDE_LIBS_FROM_ALL to remove a specific llvm library
+from llvm 'all'.
+
+This PR partially reverts 743bd15.
+This PR addresses #401, #417, #418, #422, and brings back SONAME.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a7d1927..be4fefd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -335,36 +335,7 @@
- target_link_libraries( ${TARGET_NAME}
-LINK_PRIVATE
-${OPENCL_CLANG_LINK_LIBS}
+@@ -298,21 +298,23 @@ else()
+ )
+ endif()
+
+-add_library(${TARGET_NAME} SHARED
+-${TARGET_INCLUDE_FILES}
+-${TARGET_SOURCE_FILES}
+-$
+-)
+-
+-# Same CRT compile option are reqiured to avoid link errors on Windows.
+-# MD and MDd are choosed by default for release and debug build in LLVM.
+-# If users set MT or MTd flags, they also need to add the flags for
+-# opencl-clang sources using a custom macro set_msvc_crt_flags.
+-if(COMMAND set_msvc_crt_flags)
+-set_msvc_crt_flags(${TARGET_NAME})
++set(EXCLUDE_LIBS_FROM_ALL "" CACHE STRING "Space-separated list of LLVM
libraries to exclude from all")
++llvm_map_components_to_libnames(ALL_LLVM_LIBS all)
++if (NOT "${EXCLUDE_LIBS_FROM_ALL}" STREQUAL "")
++ list(REMOVE_ITEM ALL_LLVM_LIBS ${EXCLUDE_LIBS_FROM_ALL})
+ endif()
++list(APPEND OPENCL_CLANG_LINK_LIBS ${ALL_LLVM_LIBS})
++
++add_llvm_library(${TARGET_NAME} SHARED
++ ${TARGET_INCLUDE_FILES}
++ ${TARGET_SOURCE_FILES}
++ $
+
+-add_dependencies(${TARGET_NAME} CClangCompileOptions)
++ DEPENDS CClangCompileOptions
++
++ LINK_LIBS
++${OPENCL_CLANG_LINK_LIBS}
++ )
+
+ if (WIN32)
+ # Enable compiler generation of Control Flow Guard security checks.
+@@ -328,51 +330,6 @@ elseif(UNIX)
+ LINK_FLAGS " -Wl,--no-undefined")
+ endif(WIN32)
+
+-# Enable new IN_LIST operator.
+-cmake_policy(SET CMP0057 NEW)
+-set(OTHER_LIBRARIES)
+-if ("NVPTX" IN_LIST LLVM_TARGETS_TO_BUILD)
+-list(APPEND OTHER_LIBRARIES LLVMNVPTXCodeGen LLVMNVPTXDesc LLVMNVPTXInfo)
+-endif()
+-if ("AMDGPU" IN_LIST LLVM_TARGETS_TO_BUILD)
+-list(APPEND OTHER_LIBRARIES LLVMAMDGPUCodeGen LLVMAMDGPUAsmParser
LLVMAMDGPUDesc LLVMAMDGPUInfo)
+-endif()
+-
+-target_link_libraries( ${TARGET_NAME}
+- LINK_PRIVATE
+- ${OPENCL_CLANG_LINK_LIBS}
- LLVMX86CodeGen
- LLVMX86AsmParser
- LLVMX86Desc
@@ -34,7 +98,8 @@
- LLVMTarget
- LLVMBitReader
- ${OTHER_LIBRARIES}
-+ LLVM
- )
-
+- )
+-
install(FILES opencl_clang.h
+ DESTINATION include/cclang
+ COMPONENT ${TARGET_NAME})
diff --git a/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild
b/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild
similarity index 100%
rename from dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild
rename to dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/files/, dev-libs/opencl-clang/
commit: 711131d3ce3d69ee841f7dd175c091da404dd151
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Feb 27 14:34:04 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Feb 27 14:39:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711131d3
dev-libs/opencl-clang: bump to version 11.1.0_pre20201222
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki 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 insertions(+)
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 1337910ae00..79e7ce31a52 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,3 +1,4 @@
DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B
8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb
SHA512
406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B
a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af
SHA512
817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
DIST opencl-clang-11.0.0.tar.gz 79487 BLAKE2B
a5ec89c68dd31f53881a002fda0fa9f83b6355273a6f2085c6794a0c9a74ba44b8ac21175854a87427c30523f2dd024006050b77d90bbfa7041e4abfbf0bb9e5
SHA512
bd27d15d5e6f396f0b0a79fb1f2081033e26db1df701a37558f7b9976299e17cfb383beff8fb0f1a5ab63601648cac2a33e4de73100fd1ab8706161c52aabe3c
+DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B
efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e
SHA512
46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
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
new file mode 100644
index 000..6df90f21a05
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-11.1.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 "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
new file mode 100644
index 000..12fd32b2fc7
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild
@@ -0,0 +1,46 @@
+# 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
+}
