From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: 49794@debbugs.gnu.org
Subject: [bug#49794] [PATCH core-updates-frozen] fix mesa-opencl and mesa-opencl-icd build failure
Date: Sat, 31 Jul 2021 18:08:28 +0000 [thread overview]
Message-ID: <vEPkkPmJcvnI97GxFJybopbmrou4Z2wNrA3gmxLXOAJzdBxLWi--WmJRXFWVLAL1j65B_sbmIWR-wSFZ1heZgHknsLpDu8ALQX0rKTrK-wY=@protonmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 975 bytes --]
Hello,
Attached is a patch to fix failures for mesa-opencl and mesa-opencl-icd building with the update to 21.1.6 for Mesa. This is from upstream, a change in meson.build that removed LLVM targets (for CMake users it seems) but then breaks compilation for us on a shared library LLVM build.
https://gitlab.freedesktop.org/mesa/mesa/-/issues/4443
https://gitlab.freedesktop.org/mesa/mesa/-/issues/4302
And the commit that changed it: https://gitlab.freedesktop.org/mesa/mesa/-/commit/80817b6e344258ac9b955f824ebf9019a0fc1610
The patch restores 'all-targets' to llvm_modules and successfully builds. Apologies about the long line and I'm still guessing at some of the scheme patching code. Since Mesa takes a while to build I didn't want to go through many iterations to get the code cleaner. Please feel free to make it better, and I would think mesa-opencl-icu should be able to inherit the patch from mesa-opencl, but I didn't try to do that.
Thanks,
John
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-mesa-fix-mesa-opencl-and-mesa-opencl-icd-21.1.6.patch --]
[-- Type: text/x-patch; name=0001-gnu-mesa-fix-mesa-opencl-and-mesa-opencl-icd-21.1.6.patch, Size: 2381 bytes --]
From 92744e9f54db9931253e17245d2c3841c6ac6369 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Sat, 31 Jul 2021 13:57:37 -0400
Subject: [PATCH] gnu: mesa: fix mesa-opencl and mesa-opencl-icd 21.1.6
* gnu/packages/gl.scm (mesa-opencl): Restore LLVM targets to meson.build
* gnu/packages/gl.scm (mesa-opencl-icd): Restore LLVM targets to meson.build
---
gnu/packages/gl.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e316352377..cdd98dd8fd 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -474,7 +474,16 @@ from software emulation to complete hardware acceleration for modern GPUs.")
(arguments
(substitute-keyword-arguments (package-arguments mesa)
((#:configure-flags flags)
- `(cons "-Dgallium-opencl=standalone" ,flags))))
+ `(cons "-Dgallium-opencl=standalone" ,flags))
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'enable-llvm-platforms
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Restore all LLVM targets in order to build with our LLVM
+ ;; as a shared library.
+ (substitute* "meson.build"
+ (("'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',")
+ "'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',"))))))))
(inputs
`(("libclc" ,libclc)
,@(package-inputs mesa)))
@@ -492,6 +501,13 @@ from software emulation to complete hardware acceleration for modern GPUs.")
,(delete "-Dgallium-opencl=standalone" flags)))
((#:phases phases)
`(modify-phases ,phases
+ (add-after 'unpack 'enable-llvm-platforms
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Restore all LLVM targets in order to build with our LLVM
+ ;; as a shared library.
+ (substitute* "meson.build"
+ (("'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',")
+ "'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',"))))
(add-after 'install 'mesa-icd-absolute-path
(lambda _
;; Use absolute path for OpenCL platform library.
--
2.32.0
next reply other threads:[~2021-07-31 18:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-31 18:08 John Kehayias via Guix-patches via [this message]
2021-08-03 17:49 ` bug#49794: [PATCH core-updates-frozen] fix mesa-opencl and mesa-opencl-icd build failure Ludovic Courtès
2021-08-03 18:04 ` [bug#49794] " John Kehayias via Guix-patches via
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='vEPkkPmJcvnI97GxFJybopbmrou4Z2wNrA3gmxLXOAJzdBxLWi--WmJRXFWVLAL1j65B_sbmIWR-wSFZ1heZgHknsLpDu8ALQX0rKTrK-wY=@protonmail.com' \
--to=guix-patches@gnu.org \
--cc=49794@debbugs.gnu.org \
--cc=john.kehayias@protonmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).