Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Feb 2022 02:26:15 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: da8ba36617a3 - 2022Q1 - graphics/vulkan-loader: respect PREFIX more
Message-ID:  <202202060226.2162QFtS041726@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by jbeich:

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

commit da8ba36617a30b491c6497b46a97969c3f2c772d
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:26:08 +0000

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

diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index 080429ba5343..f6b9f23c9614 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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202060226.2162QFtS041726>