git: 8287c8a0c70e - main - graphics/vulkan-loader: respect PREFIX more

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sun, 06 Feb 2022 02:26:01 UTC

The branch main has been updated by jbeich:

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

commit 8287c8a0c70e663b233f3c091504b542196c07f7
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-02-06 02:05:51 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-02-06 02:25:54 +0000

    graphics/vulkan-loader: respect PREFIX more
    
    $ VK_LOADER_DEBUG=layer vkcube-xcb
    [...]
    LAYER:       /etc/xdg/vulkan/implicit_layer.d
    [...]
---
 graphics/vulkan-loader/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index 475a9554e6e1..1156de7e8bca 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -36,9 +36,12 @@ XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
 post-patch:
 # Extract (snapshot) version from the port
+# Respect PREFIX when XDG_CONFIG_DIRS and XDG_DATA_DIRS are unset
 	@${REINPLACE_CMD} -e '/find_.*Git/d' \
 		-e '/BRANCH/s/--unknown--/main/' \
 		-e '/TAG/s/--unknown--/${DISTVERSIONFULL}/' \
+		-e '/FALLBACK/s,/etc,${PREFIX}&,' \
+		-e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/CMakeLists.txt
 # https://bugs.llvm.org/show_bug.cgi?id=47348
 	@if [ "${CHOSEN_COMPILER_TYPE}-${ARCH}-${_OSRELEASE:C/.*-//}" = "clang-i386-CURRENT" ]; then \