all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#72435] [PATCH] gnu: vulkan-loader: Fix cross-compilation.
@ 2024-08-03  2:23 Zheng Junjie
  2024-08-11 10:36 ` bug#72435: " Christopher Baines
  0 siblings, 1 reply; 2+ messages in thread
From: Zheng Junjie @ 2024-08-03  2:23 UTC (permalink / raw)
  To: 72435

* gnu/packages/vulkan.scm (vulkan-loader)[arguments]<#:configure>: When
cross-compilation, set the PKG_CONFIG_EXECUTABLE variable.

Change-Id: Ie0466a64effa5c93f859ff872423f2403f23f5cb
---
 gnu/packages/vulkan.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 25542c1e06..8aee673653 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
 ;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
 ;;; Copyright © 2022, 2024 dan <i@dan.games>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -297,7 +297,11 @@ (define-public vulkan-loader
                                        (search-input-directory
                                         %build-inputs "include/vulkan"))))
               #$@(if (%current-target-system)
-                     #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF")
+                     #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF"
+                        (string-append "-DPKG_CONFIG_EXECUTABLE="
+                                       (search-input-file
+                                        %build-inputs
+                                        (string-append "bin/" #$(pkg-config-for-target)))))
                      #~("-DBUILD_TESTS=ON")))
        #:phases
        #~(modify-phases %standard-phases

base-commit: b20956651a53a8f23828fdeb6945e1a31e6997a8
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#72435: [PATCH] gnu: vulkan-loader: Fix cross-compilation.
  2024-08-03  2:23 [bug#72435] [PATCH] gnu: vulkan-loader: Fix cross-compilation Zheng Junjie
@ 2024-08-11 10:36 ` Christopher Baines
  0 siblings, 0 replies; 2+ messages in thread
From: Christopher Baines @ 2024-08-11 10:36 UTC (permalink / raw)
  To: Zheng Junjie; +Cc: 72435-done

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> * gnu/packages/vulkan.scm (vulkan-loader)[arguments]<#:configure>: When
> cross-compilation, set the PKG_CONFIG_EXECUTABLE variable.
>
> Change-Id: Ie0466a64effa5c93f859ff872423f2403f23f5cb
> ---
>  gnu/packages/vulkan.scm | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

Sounds good to me, I've pushed this to master as
0f82dfeb0abe2d1d7a0fc45d7e164c3842234820.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-08-11 10:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-03  2:23 [bug#72435] [PATCH] gnu: vulkan-loader: Fix cross-compilation Zheng Junjie
2024-08-11 10:36 ` bug#72435: " Christopher Baines

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.