TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: mesa-opencl, mesa-opencl-icd: Build all the LLVM targets again.

Browse source 
Reported by John Kehayias <john.kehayias@protonmail.com>
in <https://issues.guix.gnu.org/49794>.

* gnu/packages/patches/mesa-opencl-all-targets.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gl.scm (mesa-opencl)[source]: Use it.
This commit is contained in:
Ludovic Courtès 2021-08-03 18:11:23 +02:00
parent 2b6bf23c60
commit 1685128e6e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1414,6 +1414,7 @@ dist_patch_DATA = \
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.patch \
%D%/packages/patches/mercurial-hg-extension-path.patch \
%D%/packages/patches/mesa-opencl-all-targets.patch \
%D%/packages/patches/mesa-skip-tests.patch \
%D%/packages/patches/mescc-tools-boot.patch \
%D%/packages/patches/metabat-fix-compilation.patch \

4
gnu/packages/gl.scm
View file

@ -471,6 +471,10 @@ (define-public mesa
(define-public mesa-opencl
(package/inherit mesa
(name "mesa-opencl")
(source (origin
(inherit (package-source mesa))
(patches (cons (search-patch "mesa-opencl-all-targets.patch")
(origin-patches (package-source mesa))))))
(arguments
(substitute-keyword-arguments (package-arguments mesa)
((#:configure-flags flags)

25
gnu/packages/patches/mesa-opencl-all-targets.patch Normal file
View file

@ -0,0 +1,25 @@
This patch restores LLVM targets needed for OpenCL, *reverting* this
upstream commit:
From 80817b6e344258ac9b955f824ebf9019a0fc1610 Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Wed, 18 Nov 2020 18:30:30 -0800
Subject: [PATCH] meson: Adjust Clover's required LLVM modules
diff --git a/meson.build b/meson.build
index 6d1607c35a3..f828eb80faa 100644
--- b/meson.build
+++ a/meson.build
@@ -1479,10 +1479,9 @@
endif
if with_gallium_opencl
llvm_modules += [
- 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',
- 'lto', 'option', 'objcarcopts', 'profiledata'
+ 'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',
+ 'lto', 'option', 'objcarcopts', 'profiledata',
]
- llvm_optional_modules += ['frontendopenmp']
endif
if with_microsoft_clc
llvm_modules += ['target', 'linker', 'irreader', 'option', 'libdriver']