bug#49794: [PATCH core-updates-frozen] fix mesa-opencl and mesa-opencl-icd build failure

[Ludovic Courtès]

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’.