From fa7309cb976e3e73d59f271be3da01fee3006152 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Fri, 24 Nov 2023 09:52:53 +0100 Subject: [PATCH] lang/clover: Restrict llvm to max version 16 Clover cannot (yet?) be compiled with LLVM17, it misses llvm/Transforms/IPO/PassManagerBuilder.h For now set a max version of llvm to 16 for clover only, people should still be able to use llvm17 for other mesa componant if they are not interested in clover. While here clean up a bit the USES=llvm for mesa port, we already set noexport in mesa-dri/Makefile.common so no need to set it in all the ports. Sponsored by: Beckhoff Automation GmbH & Co. KG PR: 275290 --- graphics/libosmesa/Makefile | 2 +- graphics/mesa-dri/Makefile | 2 +- graphics/mesa-gallium-va/Makefile | 2 +- graphics/mesa-gallium-vdpau/Makefile | 2 +- graphics/mesa-gallium-xa/Makefile | 2 +- lang/clover/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile index 17a3660608b2d..747e22dd8b46e 100644 --- a/graphics/libosmesa/Makefile +++ b/graphics/libosmesa/Makefile @@ -10,7 +10,7 @@ LICENSE_FILE= ${WRKSRC}/docs/license.rst LIB_DEPENDS+= libglapi.so:graphics/mesa-libs -USES= llvm:lib,noexport xorg +USES= llvm:lib xorg USE_XORG= xorgproto USE_LDCONFIG= yes diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index e309b1adf75f2..4e79e3ef500cd 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -8,7 +8,7 @@ WWW= https://www.mesa3d.org/ LIB_DEPENDS+= libglapi.so:graphics/mesa-libs -USES+= llvm:lib,noexport +USES+= llvm:lib OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile index 91a565557ce9f..78ef35b950120 100644 --- a/graphics/mesa-gallium-va/Makefile +++ b/graphics/mesa-gallium-va/Makefile @@ -15,7 +15,7 @@ ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware LIB_DEPENDS= libva.so:multimedia/libva \ libzstd.so:archivers/zstd -USES= llvm:lib,noexport +USES= llvm:lib OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile index 43cf846da711c..07fc35d0c0ff6 100644 --- a/graphics/mesa-gallium-vdpau/Makefile +++ b/graphics/mesa-gallium-vdpau/Makefile @@ -15,7 +15,7 @@ ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware LIB_DEPENDS= libvdpau.so:multimedia/libvdpau \ libzstd.so:archivers/zstd -USES= llvm:lib,noexport +USES= llvm:lib OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 diff --git a/graphics/mesa-gallium-xa/Makefile b/graphics/mesa-gallium-xa/Makefile index 72d13b41fa26e..5ec8474145e9a 100644 --- a/graphics/mesa-gallium-xa/Makefile +++ b/graphics/mesa-gallium-xa/Makefile @@ -11,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/docs/license.rst ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= used only by VMware supported architectures -USES= llvm:lib,noexport xorg +USES= llvm:lib xorg USE_XORG= xorgproto .include diff --git a/lang/clover/Makefile b/lang/clover/Makefile index 6c3c00ef1ad56..e083b4b8a006b 100644 --- a/lang/clover/Makefile +++ b/lang/clover/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ RUN_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl -USES= llvm:lib,noexport +USES= llvm:lib,max=16 .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"