From 61a14041f677980043099cbc8890e1d3e991945b Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 15 Aug 2022 20:45:21 +0000 Subject: opencl-clang: update to 14.0.0 to fix the build Changes unknown + untested. --- parallel/opencl-clang/Makefile | 7 +++---- parallel/opencl-clang/PLIST | 4 ++-- parallel/opencl-clang/distinfo | 9 ++++----- parallel/opencl-clang/patches/patch-CMakeLists.txt | 16 ---------------- 4 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 parallel/opencl-clang/patches/patch-CMakeLists.txt (limited to 'parallel') diff --git a/parallel/opencl-clang/Makefile b/parallel/opencl-clang/Makefile index 9dbcae3e511..9b0385d3887 100644 --- a/parallel/opencl-clang/Makefile +++ b/parallel/opencl-clang/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2022/04/18 19:10:04 adam Exp $ +# $NetBSD: Makefile,v 1.7 2022/08/15 20:45:21 tnn Exp $ -DISTNAME= opencl-clang-13.0.0 -PKGREVISION= 2 +DISTNAME= opencl-clang-14.0.0 CATEGORIES= parallel MASTER_SITES= ${MASTER_SITE_GITHUB:=intel/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -15,7 +14,7 @@ USE_CMAKE= yes USE_LANGUAGES= c c++ # C++14 -GCC_REQD+= 5 +GCC_REQD+= 7 # sync with llvm/clang .include "../../parallel/spirv-llvm-translator/buildlink3.mk" .include "../../lang/clang/buildlink3.mk" diff --git a/parallel/opencl-clang/PLIST b/parallel/opencl-clang/PLIST index 34b7fdb275a..e3108eccdf4 100644 --- a/parallel/opencl-clang/PLIST +++ b/parallel/opencl-clang/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2021/11/23 20:55:44 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2022/08/15 20:45:21 tnn Exp $ include/cclang/common_clang.h lib/libopencl-clang.so -lib/libopencl-clang.so.13 +lib/libopencl-clang.so.14 diff --git a/parallel/opencl-clang/distinfo b/parallel/opencl-clang/distinfo index 51b8cd4d230..5e4ec78df41 100644 --- a/parallel/opencl-clang/distinfo +++ b/parallel/opencl-clang/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.6 2021/11/23 20:55:44 wiz Exp $ +$NetBSD: distinfo,v 1.7 2022/08/15 20:45:21 tnn Exp $ -BLAKE2s (opencl-clang-13.0.0.tar.gz) = 1d025d228a84678a26a030f1ff3854698fb62b1eb8c7b191f05a0a279dff4ee3 -SHA512 (opencl-clang-13.0.0.tar.gz) = d346e51339060795d80bdf9d3e3b58e55b089d94ed3c0bc3c7e1e8f81a5f65238d90dacc95ec27e8db7d38a6a03b05df5c4120e9ba0ec72a7bbca28a59d697f7 -Size (opencl-clang-13.0.0.tar.gz) = 25299 bytes -SHA1 (patch-CMakeLists.txt) = 41c76ef942211aa4013df47339471ce38aae4d3b +BLAKE2s (opencl-clang-14.0.0.tar.gz) = 8288929d7e9ea2acbfc7bb59c3a1c3affb604546acd3c9aae2b1de5b2d8f7a36 +SHA512 (opencl-clang-14.0.0.tar.gz) = ab9a3fd40542283bdd2646d9ef8d3217420c82a41b183d705e48f48949505ecadc1fa435e23a7ceadf5a335200f5f3752b42715e2ac7f63173fc09637c5c609a +Size (opencl-clang-14.0.0.tar.gz) = 26109 bytes diff --git a/parallel/opencl-clang/patches/patch-CMakeLists.txt b/parallel/opencl-clang/patches/patch-CMakeLists.txt deleted file mode 100644 index 7074d3fff70..00000000000 --- a/parallel/opencl-clang/patches/patch-CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2021/11/23 20:55:44 wiz Exp $ - -Default to llvm 13. -https://github.com/intel/opencl-clang/issues/293 - ---- CMakeLists.txt.orig 2021-08-30 13:13:55.000000000 +0000 -+++ CMakeLists.txt -@@ -20,7 +20,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRE - 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 "[OPENCL-CLANG] Looking for LLVM version ${PREFERRED_LLVM_VERSION}") - find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED) -- cgit v1.2.3