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: fa7309c ("lang/clover: Restrict llvm to max version 16") Sponsored by: Beckhoff Automation GmbH & Co. KG
freebsd · Nov 24, 2023 · 6e38f0a · 6e38f0a
1 parent 231c5bc
commit 6e38f0a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"