From: "Ludovic Courtès" <ludo@gnu.org>
To: John Kehayias <john.kehayias@protonmail.com>
Cc: 49794-done@debbugs.gnu.org
Subject: bug#49794: [PATCH core-updates-frozen] fix mesa-opencl and mesa-opencl-icd build failure
Date: Tue, 03 Aug 2021 19:49:41 +0200 [thread overview]
Message-ID: <87tuk6s9je.fsf@gnu.org> (raw)
In-Reply-To: <vEPkkPmJcvnI97GxFJybopbmrou4Z2wNrA3gmxLXOAJzdBxLWi--WmJRXFWVLAL1j65B_sbmIWR-wSFZ1heZgHknsLpDu8ALQX0rKTrK-wY=@protonmail.com> (John Kehayias's message of "Sat, 31 Jul 2021 18:08:28 +0000")
Hi John,
John Kehayias <john.kehayias@protonmail.com> skribis:
> 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.
[...]
> + ((#: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',"))))))))
I feel this is easier to follow when expressed as a good old patch, so I
took the liberty to do that and pushed it as
1685128e6e1147049feddee617a616ce7f3592c0.
Let me know if anything’s amiss.
Thanks!
Ludo’.
next prev parent reply other threads:[~2021-08-03 17:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-31 18:08 [bug#49794] [PATCH core-updates-frozen] fix mesa-opencl and mesa-opencl-icd build failure John Kehayias via Guix-patches via
2021-08-03 17:49 ` Ludovic Courtès [this message]
2021-08-03 18:04 ` 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=87tuk6s9je.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=49794-done@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).