From: Z572 <zhengjunjie@iscas.ac.cn>
To: Mathieu Othacehe <othacehe@gnu.org>
Cc: 68133@debbugs.gnu.org, efraim@flashner.co.il
Subject: [bug#68133] [PATCH] gnu: mesa: Fix cross-compiling again.
Date: Wed, 10 Jan 2024 20:19:09 +0800 [thread overview]
Message-ID: <871qape5qz.fsf@iscas.ac.cn> (raw)
In-Reply-To: <87edeqdf2m.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 802 bytes --]
Mathieu Othacehe <othacehe@gnu.org> writes:
> Hello,
>
>> * gnu/packages/gl.scm(mesa)[native-inputs]: when cross-compile, add
>> cmake-minimal-cross.
>> [arguments]: adjust fix-cross-compiling to find llvm.
>>
>> * gnu/packages/llvm.scm(llvm-for-mesa)
>> [arguments]<#:configure-flags>: When cross-compile, set
>> -DBUILD_SHARED_LIBS:BOOL=TRUE and -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE,
>> remove -DLLVM_LINK_LLVM_DYLIB.* .
>> <#:phases>: when cross-compile, remove delete-static-libraries phase.
>
> I amended the commit message and applied,
>
> Thanks,
>
> Mathieu
after mesa-updates merge, mesa's meson.build use config-tool method to
find llvm, so cross compile break again, this patch fix it.
``` meson.build
1712| method : host_machine.system() == 'windows' ? 'auto' : 'config-tool',
```
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-mesa-fix-cross-compiling-again.patch --]
[-- Type: text/x-patch, Size: 1328 bytes --]
From c7b0f3a8f4886da8a3b120758409abf3777a82f8 Mon Sep 17 00:00:00 2001
Message-ID: <c7b0f3a8f4886da8a3b120758409abf3777a82f8.1704889051.git.zhengjunjie@iscas.ac.cn>
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Wed, 10 Jan 2024 20:14:32 +0800
Subject: [PATCH] gnu: mesa: fix cross-compiling again.
* gnu/packages/gl.scm(mesa)[arguments]<#:phases>: when cross compiling, force
use cmake method to find llvm.
Change-Id: I27f6f4d9d71028c15588eeade48d3a918c042b9c
---
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 @@ (define-public mesa
;; 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")))))
base-commit: e541f9593f8bfc84b6140c2408b393243289fae6
--
2.41.0
next prev parent reply other threads:[~2024-01-10 12:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-30 4:53 [bug#68133] [PATCH] gnu: glew: Fix cross-compiling Zheng Junjie
2024-01-03 14:25 ` Mathieu Othacehe
2024-01-04 12:40 ` Zheng Junjie
2024-01-09 9:35 ` bug#68133: " Mathieu Othacehe
2024-01-10 12:19 ` Z572 [this message]
2024-01-10 14:30 ` [bug#68133] [PATCH] gnu: mesa: Fix cross-compiling again Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871qape5qz.fsf@iscas.ac.cn \
--to=zhengjunjie@iscas.ac.cn \
--cc=68133@debbugs.gnu.org \
--cc=efraim@flashner.co.il \
--cc=othacehe@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.