git: 6e38f0a6247d - main - graphics/mesa*: Drop llvm,noexport in Makefile.common
Date: Fri, 24 Nov 2023 10:17:47 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6e38f0a6247d51ca1ec03ab9ad2478ff71e90884
commit 6e38f0a6247d51ca1ec03ab9ad2478ff71e90884
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-11-24 10:15:43 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-11-24 10:15:43 +0000
graphics/mesa*: Drop llvm,noexport in Makefile.common
And put noexport in every mesa ports.
It does work to have multiple USES= llvm (see PR 199603).
Reported by: jbeich
Fixes: fa7309cb976e ("lang/clover: Restrict llvm to max version 16")
Sponsored by: Beckhoff Automation GmbH & Co. KG
---
graphics/libosmesa/Makefile | 2 +-
graphics/mesa-dri/Makefile | 2 +-
graphics/mesa-dri/Makefile.common | 2 +-
graphics/mesa-gallium-va/Makefile | 2 +-
graphics/mesa-gallium-vdpau/Makefile | 2 +-
graphics/mesa-gallium-xa/Makefile | 2 +-
lang/clover/Makefile | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile
index 747e22dd8b46..17a3660608b2 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 xorg
+USES= llvm:lib,noexport xorg
USE_XORG= xorgproto
USE_LDCONFIG= yes
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 4e79e3ef500c..e309b1adf75f 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
+USES+= llvm:lib,noexport
OPTIONS_GROUP= PLATFORM
OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 4767a0854f9f..c046d4f0eb4e 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -45,7 +45,7 @@ USES+= xorg
LIB_DEPENDS+= libdrm.so:graphics/libdrm
.endif
-USES+= compiler:c++11-lib bison llvm:noexport meson pathfix pkgconfig \
+USES+= compiler:c++11-lib bison meson pathfix pkgconfig \
python:build shebangfix tar:xz
.if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile
index 78ef35b95012..91a565557ce9 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
+USES= llvm:lib,noexport
OPTIONS_DEFINE= X11
OPTIONS_DEFAULT= X11
diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile
index 07fc35d0c0ff..43cf846da711 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
+USES= llvm:lib,noexport
OPTIONS_DEFINE= X11
OPTIONS_DEFAULT= X11
diff --git a/graphics/mesa-gallium-xa/Makefile b/graphics/mesa-gallium-xa/Makefile
index 5ec8474145e9..72d13b41fa26 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 xorg
+USES= llvm:lib,noexport xorg
USE_XORG= xorgproto
.include <bsd.port.options.mk>
diff --git a/lang/clover/Makefile b/lang/clover/Makefile
index e083b4b8a006..f38c41a5cda4 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,max=16
+USES= llvm:lib,max=16,noexport
.include <bsd.port.options.mk>
.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"