From nobody Sun Feb 6 02:26:15 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0057019A5CCE; Sun, 6 Feb 2022 02:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JrtS75dk1z4kX2; Sun, 6 Feb 2022 02:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644114375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxuWOmRu8gAAu2FG0s2gQOQgBJG5OjhNHtc9/vtDuM4=; b=o1/H0DK6ok4HPqB71HR1C/fWk1GELt8A09X8s0/nJzTxnHlPtMZkFGfWUgEQxPQb5cqlsq vYNahaT3AVbufz7CR/E3s5uuls8ZNmGeD3JciSAUNpXQSvLthxSqvWc29osAI2wybxngN9 iyG63KQTRPCPrOB1bCRtWKI009acV0J0beVCwYPcmfbRxQGklUzynd33amJ1o1RMNm1sQm NtBJbTx9OZT4kX2kI5IS++KzNjCgnXRYSmAtVldO1XD1WhNE317K9ZOUyLI077lzoR50EU 44NaWlsxP154q0wiWCGS4iFz5uUXsbfAqs8/On869qzJG11XA4UhlrILq6imuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A15052543; Sun, 6 Feb 2022 02:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2162QFG5041727; Sun, 6 Feb 2022 02:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2162QFtS041726; Sun, 6 Feb 2022 02:26:15 GMT (envelope-from git) Date: Sun, 6 Feb 2022 02:26:15 GMT Message-Id: <202202060226.2162QFtS041726@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: da8ba36617a3 - 2022Q1 - graphics/vulkan-loader: respect PREFIX more List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: da8ba36617a30b491c6497b46a97969c3f2c772d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644114375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxuWOmRu8gAAu2FG0s2gQOQgBJG5OjhNHtc9/vtDuM4=; b=LLTKFLir03smwCReIqI2CBAvThedJOHUWIB3Pl5Ao7SCLxe7WRX7AMouh8rys0MUQYo820 +qhvdopjDPfFBHCC5HvVLeopcXbYcVlhqfMn6UkmmgE1BTdvrJL6VwPoS2qjiRgy2u/1oG YXIaUKT2GKolJq7dfrJNto4R/3E/yhXpZo8uAr0/xwehavVIvhQWu3EigMidUIMBCwnkLn wFVheGS5G6JI86r+ybcL38eoTf+BQ8pj+Dk4Auoi3ofmB0aW5CnmCHNtMLX4I7ZdP4YIV4 TKsLlKMj4gCMH0M7Axtg2024azDeVJCP1IH34ksmRSliiAFAn3mIDPYLx5IAcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644114375; a=rsa-sha256; cv=none; b=R/Hq+ZXT2c1YSkai8XaJ9HqaW6kRRJu4A05Mf3rp5i7FKZoHi50DGBiiAccI4ZmyaoSRUg IWIKt5U8IW2Xm2e4D/1JUB48xB6vtcuUTq/iJsOgqNCcgN1XJHc8Qy6xovGY6ZjD/3M/Ot RhnAa2K2hl2wvY+CWmn612j6mySw6rOP1y/HuUmDL092Ps8Q6MZDwR+TYhjlw41UfJNxly D9M2gMz6KdszcfJ8Vs/i8s9hXl1JvPhrzfDkf0TWuXhFLm7jiV8NeLFLouqU4ddMYKQIir MB4quMj35/Nu4gEI4f9To7zAlLO/OqeWn797pA8ofsMoIOE3bO2K9VzRMDQ7YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=da8ba36617a30b491c6497b46a97969c3f2c772d commit da8ba36617a30b491c6497b46a97969c3f2c772d Author: Jan Beich AuthorDate: 2022-02-06 02:05:51 +0000 Commit: Jan Beich 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 \