[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: mesa: Fix cross-compilation.
From: |
guix-commits |
Subject: |
02/02: gnu: mesa: Fix cross-compilation. |
Date: |
Wed, 10 Jan 2024 09:32:36 -0500 (EST) |
mothacehe pushed a commit to branch master
in repository guix.
commit a126e8120d30a3f66149f307a922acd77cde9d5a
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Wed Jan 10 20:14:32 2024 +0800
gnu: mesa: Fix cross-compilation.
* gnu/packages/gl.scm(mesa)[arguments]<#:phases>: When cross-compiling,
force
the use of the cmake method to find llvm.
Change-Id: I27f6f4d9d71028c15588eeade48d3a918c042b9c
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/gl.scm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 7998142b4d..49dc878c02 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -421,6 +421,9 @@ svga,swrast,virgl,zink")))
;; When cross compiling, we use cmake to find llvm, not
;; llvm-config, because llvm-config cannot be executed
;; see https://github.com/llvm/llvm-project/issues/58984
+ (substitute* "meson.build"
+ (("method : host_machine\\.system.*")
+ "method : 'cmake',\n"))
(setenv "CMAKE"
(search-input-file
native-inputs "/bin/cmake")))))