Attachment 253017 Details for Bug 280863 – Flavorize devel/libclc

[patch] Flavorize devel/libclc

0001-devel-libclc-Flavorize-the-port.patch (text/plain), 10.76 KB, created by Emmanuel Vadot on 2024-08-22 13:54:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Vadot

Created: 2024-08-22 13:54:12 UTC

Size: 10.76 KB

patch

obsolete

>From d07827ef5e85ed9c2e436272c4fda17dac797183 Mon Sep 17 00:00:00 2001
>From: Emmanuel Vadot <manu@FreeBSD.org>
>Date: Thu, 22 Aug 2024 11:05:56 +0200
>Subject: [PATCH] devel/libclc: Flavorize the port
>
>Defines some flavors for llvm15 to llvm18 for libclc.
>This will allow users to use a different LLVM_DEFAULT without having
>to rely on the default one (llvm15 for now).
>
>PR:		280863
>Sponsored by:	Beckhoff Automation GmbH & Co. KG
>---
> devel/libclc/Makefile        | 29 +++++++++++++----
> devel/libclc/distinfo        |  3 --
> devel/libclc/distinfo.llvm15 |  3 ++
> devel/libclc/distinfo.llvm16 |  3 ++
> devel/libclc/distinfo.llvm17 |  3 ++
> devel/libclc/distinfo.llvm18 |  3 ++
> devel/libclc/pkg-plist       | 60 ++++++++++++++++++++++++++++++++++++
> graphics/mesa-devel/Makefile |  6 ++--
> graphics/mesa-dri/Makefile   |  5 +--
> lang/clover/Makefile         |  4 +--
> 10 files changed, 103 insertions(+), 16 deletions(-)
> delete mode 100644 devel/libclc/distinfo
> create mode 100644 devel/libclc/distinfo.llvm15
> create mode 100644 devel/libclc/distinfo.llvm16
> create mode 100644 devel/libclc/distinfo.llvm17
> create mode 100644 devel/libclc/distinfo.llvm18
>
>diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile
>index 2e2a32e828c5..4ead49a134b2 100644
>--- a/devel/libclc/Makefile
>+++ b/devel/libclc/Makefile
>@@ -1,8 +1,13 @@
> PORTNAME=	libclc
>-DISTVERSION=	15.0.4
>+DISTVERSION=	${DISTVERSION_${FLAVOR}}
>+DISTVERSION_llvm18=	18.1.8
>+DISTVERSION_llvm17=	17.0.6
>+DISTVERSION_llvm16=	16.0.6
>+DISTVERSION_llvm15=	15.0.7
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/
> DISTNAME=	libclc-${DISTVERSION}.src
>+PKGNAMESUFFIX=	-${FLAVOR}
> 
> MAINTAINER=	x11@FreeBSD.org
> COMMENT=	Required library functions for OpenCL C programming language
>@@ -13,14 +18,26 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
> LICENSE_NAME=	Apache License 2.0 with LLVM Exceptions
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-BUILD_DEPENDS=	llvm15>=15.0:devel/llvm15 \
>-		spirv-llvm-translator-llvm15>0:devel/spirv-llvm-translator@llvm15 \
>+BUILD_DEPENDS=	spirv-llvm-translator-${FLAVOR}>0:devel/spirv-llvm-translator@${FLAVOR} \
> 		libedit>=0:devel/libedit
> 
>-USES=		cmake compiler:c++11-lib python:build tar:xz
>+FLAVORS=	${15 16 17 18:L:S/^/llvm/}
>+
>+USES=		cmake compiler:c++11-lib llvm:${FLAVOR:S/llvm//},build,noexport python:build tar:xz
> USE_LDCONFIG=	yes
> 
> BINARY_ALIAS=	python=${PYTHON_CMD}
>-CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config15
>+CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${FLAVOR:S/llvm//}
>+DISTINFO_FILE=	${.CURDIR}/distinfo.${FLAVOR}
>+
>+.include <bsd.port.pre.mk>
>+
>+.for flavor in ${FLAVORS:N${FLAVOR}}
>+CONFLICTS+=	libclc-${flavor}
>+.endfor
>+
>+PLIST_SUB+=	${FLAVORS:N${FLAVOR}:@v@${v:tu}="\@comment "@}
>+PLIST_SUB+=	${FLAVOR:tu}=""
>+
>+.include <bsd.port.post.mk>
> 
>-.include <bsd.port.mk>
>diff --git a/devel/libclc/distinfo b/devel/libclc/distinfo
>deleted file mode 100644
>index aefd19a50653..000000000000
>--- a/devel/libclc/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1670152889
>-SHA256 (libclc-15.0.4.src.tar.xz) = 00cc092947ef533999db42d18a4134f6ee1d74a60f5c84387ef28ca9e02e2a16
>-SIZE (libclc-15.0.4.src.tar.xz) = 125840
>diff --git a/devel/libclc/distinfo.llvm15 b/devel/libclc/distinfo.llvm15
>new file mode 100644
>index 000000000000..3262e5254cf9
>--- /dev/null
>+++ b/devel/libclc/distinfo.llvm15
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1724224690
>+SHA256 (libclc-15.0.7.src.tar.xz) = 35731fea7be224f21acf5bf3cd9f0ed058bf4ada5eceaf7f10ee96e139bd3389
>+SIZE (libclc-15.0.7.src.tar.xz) = 125820
>diff --git a/devel/libclc/distinfo.llvm16 b/devel/libclc/distinfo.llvm16
>new file mode 100644
>index 000000000000..7de43687c041
>--- /dev/null
>+++ b/devel/libclc/distinfo.llvm16
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1724224686
>+SHA256 (libclc-16.0.6.src.tar.xz) = 61952af79c555d50bc88cb6f134d9abe9278f65dd34c2bc945cc3d324c2af224
>+SIZE (libclc-16.0.6.src.tar.xz) = 125656
>diff --git a/devel/libclc/distinfo.llvm17 b/devel/libclc/distinfo.llvm17
>new file mode 100644
>index 000000000000..ab97225d0614
>--- /dev/null
>+++ b/devel/libclc/distinfo.llvm17
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1724224682
>+SHA256 (libclc-17.0.6.src.tar.xz) = 122f641d94d5dfbb3c37534f2b76612fa59d15c36c2a4917369a85eaaca32148
>+SIZE (libclc-17.0.6.src.tar.xz) = 126360
>diff --git a/devel/libclc/distinfo.llvm18 b/devel/libclc/distinfo.llvm18
>new file mode 100644
>index 000000000000..0bfa93669af8
>--- /dev/null
>+++ b/devel/libclc/distinfo.llvm18
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1724224695
>+SHA256 (libclc-18.1.8.src.tar.xz) = 905bd59e9f810d6bd0ae6874725a8f8a3c91cb416199c03f2b98b57437cfb32e
>+SIZE (libclc-18.1.8.src.tar.xz) = 126572
>diff --git a/devel/libclc/pkg-plist b/devel/libclc/pkg-plist
>index 60121044550b..a0be002a20b5 100644
>--- a/devel/libclc/pkg-plist
>+++ b/devel/libclc/pkg-plist
>@@ -340,3 +340,63 @@ share/clc/tonga-amdgcn-mesa-mesa3d.bc
> share/clc/turks-r600--.bc
> share/clc/verde-amdgcn--.bc
> share/clc/verde-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1010-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1010-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1011-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1011-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1012-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1012-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1013-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1013-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1030-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1030-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1031-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1031-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1032-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1032-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1033-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1033-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1034-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1034-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1035-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1035-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1036-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1036-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1100-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1100-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1101-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1101-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1102-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1102-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1103-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1103-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1150-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1150-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1151-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1151-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1200-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1200-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx1201-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx1201-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx602-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx602-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx705-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx705-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx805-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx805-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx908-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx908-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx909-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx909-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx90a-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx90a-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx90c-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx90c-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx940-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx940-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx941-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx941-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/gfx942-amdgcn--.bc
>+%%LLVM18%%share/clc/gfx942-amdgcn-mesa-mesa3d.bc
>+%%LLVM18%%share/clc/tongapro-amdgcn--.bc
>+%%LLVM18%%share/clc/tongapro-amdgcn-mesa-mesa3d.bc
>diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
>index b2dad1f93dc9..cbacf3066d6a 100644
>--- a/graphics/mesa-devel/Makefile
>+++ b/graphics/mesa-devel/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	mesa
> DISTVERSION=	24.1-branchpoint-3782
> DISTVERSIONSUFFIX=	-gc8d64860ec7
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics
> PKGNAMESUFFIX=	-devel
> 
>@@ -107,11 +107,11 @@ LTO_MESON_TRUE=		b_lto
> 
> OPENCL_DESC=		Heterogeneous computing via OpenCL (implies LLVM)
> OPENCL_BUILD_DEPENDS=	bindgen:devel/rust-bindgen-cli \
>-			libclc>0:devel/libclc \
>+			libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
> 			spirv-tools>0:graphics/spirv-tools \
> 			rustc:lang/${RUST_DEFAULT}
> OPENCL_LIB_DEPENDS=	libLLVMSPIRVLib.so.${OPENCL_SOVERSION}:devel/spirv-llvm-translator@${LLVM_PORT:T}
>-OPENCL_RUN_DEPENDS=	libclc>0:devel/libclc
>+OPENCL_RUN_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T}
> OPENCL_SOVERSION=	${LLVM_VERSION}${${LLVM_VERSION}>=18:?.1:}
> OPENCL_CONFIGURE_ENV=	PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
> OPENCL_MESON_FALSE=	b_lundef # environ
>diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
>index 20f3b32d5fe5..f713982af69d 100644
>--- a/graphics/mesa-dri/Makefile
>+++ b/graphics/mesa-dri/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	mesa-dri
> PORTVERSION=	${MESAVERSION}
>+PORTREVISION=	1
> CATEGORIES=	graphics
> 
> COMMENT=	OpenGL hardware acceleration drivers for DRI2+
>@@ -31,7 +32,7 @@ GALLIUM_DESC=		Unified OpenGL drivers
> crocus_DESC=		Intel GPU Gen4 (Broadwater) to Gen7 (Haswell)
> i915_DESC=		Intel GPU Gen3 (Grantsdale to Pineview)
> iris_DESC=		Intel GPU Gen8 (Broadwell) and newer
>-iris_BUILD_DEPENDS=	libclc>0:devel/libclc \
>+iris_BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
> 			spirv-tools>0:graphics/spirv-tools \
> 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
> iris_RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
>@@ -59,7 +60,7 @@ OPTIONS_GROUP_VULKAN=	anv radv swrast_vk
> VULKAN_DESC=		Vulkan drivers
> anv_DESC=		Intel GPU Gen9 and newer Vulkan support
> anv_BUILD_DEPENDS=	glslangValidator:graphics/glslang \
>-			libclc>0:devel/libclc \
>+			libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
> 			spirv-tools>0:graphics/spirv-tools \
> 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
> anv_RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
>diff --git a/lang/clover/Makefile b/lang/clover/Makefile
>index fd68336056f7..b197e2fd7537 100644
>--- a/lang/clover/Makefile
>+++ b/lang/clover/Makefile
>@@ -11,13 +11,13 @@ LICENSE_FILE=	${WRKSRC}/docs/license.rst
> ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
> ONLY_FOR_ARCHS_REASON=	needs a GPU supported by the AMDGPU KMS driver
> 
>-BUILD_DEPENDS=	libclc>=0.3.0:devel/libclc \
>+BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
> 		spirv-tools>=0:graphics/spirv-tools \
> 		opencl>=0:devel/opencl
> LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd \
> 		libLLVMSPIRVLib.so.${LLVM_VERSION}:devel/spirv-llvm-translator@${LLVM_PORT:T} \
> 		libzstd.so:archivers/zstd
>-RUN_DEPENDS=	libclc>=0.3.0:devel/libclc \
>+RUN_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
> 		opencl>=0:devel/opencl
> 
> USES=		llvm:lib,max=16,noexport
>-- 
>2.46.0
>

Actions: View | Diff

Attachments on bug 280863: 252822 | 252960 | 253004 | 253017 | 253034 | 253104