pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libclc: sync with LLVM; spirv-llvm-translator added 22.1.6 to match LLVM from wip



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <adam%defguard.net@localhost>
Pushed By:	adam
Date:		Wed Sep 2 21:22:21 2026 +0200
Changeset:	1912a267cf7fbdc583a929936cc4449dc9136b7c

Modified Files:
	Makefile
	libclc/Makefile
	libclc/PLIST
	libclc/buildlink3.mk
	libclc/distinfo
	llvm/version.mk
Added Files:
	spirv-llvm-translator/DESCR
	spirv-llvm-translator/Makefile
	spirv-llvm-translator/PLIST
	spirv-llvm-translator/buildlink3.mk
	spirv-llvm-translator/distinfo

Log Message:
libclc: sync with LLVM; spirv-llvm-translator added 22.1.6 to match LLVM from wip

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1912a267cf7fbdc583a929936cc4449dc9136b7c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                            |  1 +
 libclc/Makefile                     | 24 ++++++++++--------------
 libclc/PLIST                        |  9 ++++++---
 libclc/buildlink3.mk                |  4 ++--
 libclc/distinfo                     |  6 +++---
 llvm/version.mk                     |  1 +
 spirv-llvm-translator/DESCR         |  7 +++++++
 spirv-llvm-translator/Makefile      | 32 ++++++++++++++++++++++++++++++++
 spirv-llvm-translator/PLIST         |  8 ++++++++
 spirv-llvm-translator/buildlink3.mk | 20 ++++++++++++++++++++
 spirv-llvm-translator/distinfo      |  5 +++++
 11 files changed, 95 insertions(+), 22 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 60064ea8fd..13a04e8d1d 100644
--- a/Makefile
+++ b/Makefile
@@ -5544,6 +5544,7 @@ SUBDIR+=	spidermonkey24
 SUBDIR+=	spidermonkey31
 SUBDIR+=	spiralloops
 SUBDIR+=	spiralsynth
+SUBDIR+=	spirv-llvm-translator
 SUBDIR+=	splix
 SUBDIR+=	spot
 SUBDIR+=	spread4
diff --git a/libclc/Makefile b/libclc/Makefile
index 82613966a6..1f21e62024 100644
--- a/libclc/Makefile
+++ b/libclc/Makefile
@@ -1,20 +1,16 @@
-# $NetBSD: $
+# $NetBSD$
 
-.include "../../lang/llvm/version.mk"
-# undo version.mk assumptions:
-EXTRACT_ELEMENTS=	# default
-WRKSRC=		${WRKDIR}/${DISTNAME}
+.include "../../wip/llvm/version.mk"
 
-DISTNAME=	libclc-${LLVM_VERSION}.src
-PKGNAME=	${DISTNAME:S/.src//}
-CATEGORIES=	devel
+PKGNAME=	libclc-${LLVM_VERSION}
+CATEGORIES=	lang
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://libclc.llvm.org/
 COMMENT=	OpenCL library
 LICENSE=	apache-2.0
 
-USE_CXX_FEATURES=	c++14
+USE_CXX_FEATURES=	c++17
 USE_LANGUAGES=		c c++
 GCC_REQD+=		7
 
@@ -27,11 +23,11 @@ PYTHON_FOR_BUILD_ONLY=	yes
 PKGCONFIG_OVERRIDE+=	libclc.pc.in
 
 .include "../../devel/cmake/build.mk"
-.include "../../parallel/spirv-tools/buildlink3.mk"
-.include "../../parallel/spirv-llvm-translator/buildlink3.mk"
-.include "../../lang/llvm/buildlink3.mk"
-.include "../../lang/clang/buildlink3.mk"
-.include "../../lang/libunwind/buildlink3.mk"
+.include "../../wip/clang/buildlink3.mk"
+.include "../../wip/libunwind/buildlink3.mk"
+.include "../../wip/llvm/buildlink3.mk"
 .include "../../lang/python/tool.mk"
+.include "../../parallel/spirv-tools/buildlink3.mk"
+.include "../../wip/spirv-llvm-translator/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libclc/PLIST b/libclc/PLIST
index 8619d3ff14..0206114e61 100644
--- a/libclc/PLIST
+++ b/libclc/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD$
-share/clc/amdgcn--amdhsa.bc
+share/clc/amdgcn-amd-amdhsa.bc
 share/clc/aruba-r600--.bc
 share/clc/barts-r600--.bc
 share/clc/bonaire-amdgcn--.bc
@@ -56,6 +56,10 @@ share/clc/gfx1200-amdgcn--.bc
 share/clc/gfx1200-amdgcn-mesa-mesa3d.bc
 share/clc/gfx1201-amdgcn--.bc
 share/clc/gfx1201-amdgcn-mesa-mesa3d.bc
+share/clc/gfx1250-amdgcn--.bc
+share/clc/gfx1250-amdgcn-mesa-mesa3d.bc
+share/clc/gfx1251-amdgcn--.bc
+share/clc/gfx1251-amdgcn-mesa-mesa3d.bc
 share/clc/gfx602-amdgcn--.bc
 share/clc/gfx602-amdgcn-mesa-mesa3d.bc
 share/clc/gfx705-amdgcn--.bc
@@ -96,10 +100,9 @@ share/clc/kaveri-amdgcn--.bc
 share/clc/kaveri-amdgcn-mesa-mesa3d.bc
 share/clc/mullins-amdgcn--.bc
 share/clc/mullins-amdgcn-mesa-mesa3d.bc
-share/clc/nvptx--.bc
-share/clc/nvptx--nvidiacl.bc
 share/clc/nvptx64--.bc
 share/clc/nvptx64--nvidiacl.bc
+share/clc/nvptx64-nvidia-cuda.bc
 share/clc/oland-amdgcn--.bc
 share/clc/oland-amdgcn-mesa-mesa3d.bc
 share/clc/palm-r600--.bc
diff --git a/libclc/buildlink3.mk b/libclc/buildlink3.mk
index 08d5228259..654ba6e65f 100644
--- a/libclc/buildlink3.mk
+++ b/libclc/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: $
+# $NetBSD$
 
 BUILDLINK_TREE+=	libclc
 
 .if !defined(LIBCLC_BUILDLINK3_MK)
 LIBCLC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libclc+=	libclc>=18.0.0
+BUILDLINK_API_DEPENDS.libclc+=	libclc>=22.1.0
 BUILDLINK_PKGSRCDIR.libclc?=	../../wip/libclc
 
 .include "../../lang/llvm/buildlink3.mk"
diff --git a/libclc/distinfo b/libclc/distinfo
index 1144d40cc7..e609588824 100644
--- a/libclc/distinfo
+++ b/libclc/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.24 2024/07/06 15:45:08 adam Exp $
 
-BLAKE2s (libclc-21.1.8.src.tar.xz) = 0691c5e08a762e4d0aaa57d04eb5cda4c57bf57add35921fb951b7d6048a288b
-SHA512 (libclc-21.1.8.src.tar.xz) = 920302f31833386cf7ebe995fc5578a764c99a6432ea58d94b55e84b7c0304275010d757a5c1cea76ee5cd73564bf4737960ab249995c5021b3dc4cc4c255922
-Size (libclc-21.1.8.src.tar.xz) = 149764 bytes
+BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
+SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
+Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
diff --git a/llvm/version.mk b/llvm/version.mk
index b80830f946..33fdcc7214 100644
--- a/llvm/version.mk
+++ b/llvm/version.mk
@@ -6,6 +6,7 @@
 # used by lang/clang-tools-extra
 # used by lang/compiler-rt
 # used by lang/flang
+# used by lang/libclc
 # used by lang/libcxx
 # used by lang/libcxxabi
 # used by lang/libunwind
diff --git a/spirv-llvm-translator/DESCR b/spirv-llvm-translator/DESCR
new file mode 100644
index 0000000000..3c4cb36f00
--- /dev/null
+++ b/spirv-llvm-translator/DESCR
@@ -0,0 +1,7 @@
+The LLVM/SPIR-V Bi-Directional Translator is a library and tool for translation
+between LLVM IR and SPIR-V.
+
+SPIR-V is a binary intermediate language for representing graphical-shader
+stages and compute kernels for multiple Khronos APIs, including OpenCL,
+OpenGL, and Vulkan. SPIR-V defines a new language and is a successor to the
+original Khronos SPIR, which supported only OpenCL device programs.
diff --git a/spirv-llvm-translator/Makefile b/spirv-llvm-translator/Makefile
new file mode 100644
index 0000000000..471a37ea34
--- /dev/null
+++ b/spirv-llvm-translator/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.18 2026/09/02 14:11:41 adam Exp $
+
+# Note that parallel/spirv-headers must be kept in sync with what this
+# package expects.
+DISTNAME=	SPIRV-LLVM-Translator-22.1.6
+PKGNAME=	${DISTNAME:tl}
+CATEGORIES=	parallel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=KhronosGroup/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/KhronosGroup/SPIRV-LLVM-Translator
+COMMENT=	Tool and library for translation between SPIR-V and LLVM IR
+LICENSE=	modified-bsd
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
+GCC_REQD+=	7 # sync with llvm
+
+CMAKE_CONFIGURE_ARGS+=	-DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+=	-DCCACHE_ALLOWED=OFF
+CMAKE_CONFIGURE_ARGS+=	-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${PREFIX}/include/libLLVM
+
+PKGCONFIG_OVERRIDE+=	LLVMSPIRVLib.pc.in
+
+.include "../../devel/cmake/build.mk"
+.include "../../wip/llvm/buildlink3.mk"
+.include "../../parallel/spirv-headers/buildlink3.mk"
+.include "../../parallel/spirv-tools/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/spirv-llvm-translator/PLIST b/spirv-llvm-translator/PLIST
new file mode 100644
index 0000000000..bd571cf18f
--- /dev/null
+++ b/spirv-llvm-translator/PLIST
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.12 2026/04/16 06:39:35 wiz Exp $
+bin/llvm-spirv
+include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc
+include/LLVMSPIRVLib/LLVMSPIRVLib.h
+include/LLVMSPIRVLib/LLVMSPIRVOpts.h
+lib/libLLVMSPIRVLib.so
+lib/libLLVMSPIRVLib.so.21.1
+lib/pkgconfig/LLVMSPIRVLib.pc
diff --git a/spirv-llvm-translator/buildlink3.mk b/spirv-llvm-translator/buildlink3.mk
new file mode 100644
index 0000000000..33a1023449
--- /dev/null
+++ b/spirv-llvm-translator/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.6 2026/09/02 14:11:41 adam Exp $
+
+BUILDLINK_TREE+=	spirv-llvm-translator
+
+.if !defined(SPIRV_LLVM_TRANSLATOR_BUILDLINK3_MK)
+SPIRV_LLVM_TRANSLATOR_BUILDLINK3_MK:=
+
+GCC_REQD+=	7 # sync with llvm
+
+BUILDLINK_API_DEPENDS.spirv-llvm-translator+=	spirv-llvm-translator>=14.0.0
+BUILDLINK_ABI_DEPENDS.spirv-llvm-translator+=	spirv-llvm-translator>=19.1.7nb1
+BUILDLINK_PKGSRCDIR.spirv-llvm-translator?=	../../parallel/spirv-llvm-translator
+
+.include "../../lang/llvm/buildlink3.mk"
+
+BUILDLINK_FILES.spirv-llvm-translator+=	bin/llvm-spirv
+
+.endif	# SPIRV_LLVM_TRANSLATOR_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-spirv-llvm-translator
diff --git a/spirv-llvm-translator/distinfo b/spirv-llvm-translator/distinfo
new file mode 100644
index 0000000000..7cdd049977
--- /dev/null
+++ b/spirv-llvm-translator/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.16 2026/09/02 14:11:41 adam Exp $
+
+BLAKE2s (SPIRV-LLVM-Translator-22.1.6.tar.gz) = 5be7b49421e237c2aff45234ac3c09e8986d20d91725239415a9d066ef71829b
+SHA512 (SPIRV-LLVM-Translator-22.1.6.tar.gz) = da0326c93a3988c11a32a298e82b07b33978e2d5ae080d65a243a8125017d63824d1d42d759232f7bf138663eba25e57e45b2d4b2e9f77c01f1e21b80353f461
+Size (SPIRV-LLVM-Translator-22.1.6.tar.gz) = 1884210 bytes


Home | Main Index | Thread Index | Old Index