git: e8496063d033 - main - graphics/mesa-{dri,libs}: Fix building with iris and anv off

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e8496063d03373a79836fbde567cec690ade70f5

commit e8496063d03373a79836fbde567cec690ade70f5
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-06-18 19:44:56 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-06-18 20:06:26 +0000

    graphics/mesa-{dri,libs}: Fix building with iris and anv off
    
    Move the pkgconfig related CONFIGURE_ENV knob to a common place instead of
    activating it depending on options.
    
    PR:             296094
    Reported by:    Oleh Hushchenkov <o.hushchenkov@gmail.com>
---
 graphics/mesa-dri/Makefile        | 2 --
 graphics/mesa-dri/Makefile.common | 2 ++
 graphics/mesa-libs/Makefile       | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 4a5f1eccead7..154d7a2ff25d 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -38,7 +38,6 @@ iris_BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
 iris_RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
-iris_CONFIGURE_ENV=	PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
 iris_IMPLIES=		SPIRV
 llvmpipe_DESC=		Software Rasterizer
 panfrost_DESC=		ARM Midgard and Bifrost
@@ -67,7 +66,6 @@ anv_BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
 anv_RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
 			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
-anv_CONFIGURE_ENV=	PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
 radv_DESC=		AMD/ATI Southern Islands and newer Vulkan support
 radv_BUILD_DEPENDS=	glslangValidator:graphics/glslang
 swrast_vk_DESC=		Software Rasterizer Vulkan support
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 8b0d8c018ade..72cb4d12e9ca 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -56,6 +56,8 @@ LTO_UNSAFE=	Upstream recommends against LTO https://gitlab.freedesktop.org/mesa/
 BINARY_ALIAS+=	python3=${PYTHON_VERSION}
 
 CONFIGURE_ENV+=	LLVM_CONFIG=${LLVM_CONFIG}
+# Needed to locate libclc
+CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
 
 # mesa 25.x removed the -Dlibelf option; libelf is now auto-detected.
 # If the user has elfutils installed in LOCALBASE, propagate it as a
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index a299f97f2c1a..5ccbf75018ce 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -20,8 +20,6 @@ LIB_DEPENDS=	libdisplay-info.so:sysutils/libdisplay-info
 RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
 		spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
 
-CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
-
 OPTIONS_GROUP=		PLATFORM
 OPTIONS_GROUP_PLATFORM=	X11 WAYLAND
 X11_DESC=		Enable X11 support for GBM/EGL