mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 23:06:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mesa: Fix build on arm architectures.

Browse source 
* gnu/packages/gl.scm (mesa)[inputs]: When building for an arm platform
add python-pycparser.
[arguments]: When building for aarch64 or armhf don't add kmsro as a
gallium driver.
* gnu/packages/python-xyz.scm (python-pycparser): Mark as a dependency
for mesa.

Change-Id: I61182157418a6667fcbb0d4280c959a708119b0d
This commit is contained in:
Efraim Flashner 2024-09-10 12:05:01 +03:00 committed by John Kehayias
parent 138273c4e8
commit e13f4b10c5
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/gl.scm
View file

@ -348,6 +348,10 @@ (define-public mesa
python-pyyaml python-pyyaml
python-wrapper python-wrapper
(@ (gnu packages base) which)) (@ (gnu packages base) which))
(if (target-arm?)
;; Needed for etnaviv.
(list python-pycparser)
'())
(if (%current-target-system) (if (%current-target-system)
(list cmake-minimal-cross (list cmake-minimal-cross
pkg-config-for-build pkg-config-for-build
@ -362,11 +366,11 @@ (define-public mesa
#$@(cond #$@(cond
((target-aarch64?) ((target-aarch64?)
;; This includes more drivers than "auto": asahi, r300, r600 ;; This includes more drivers than "auto": asahi, r300, r600
'("-Dgallium-drivers=asahi,etnaviv,freedreno,kmsro,lima,\ '("-Dgallium-drivers=asahi,etnaviv,freedreno,lima,nouveau,\
nouveau,panfrost,r300,r600,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl,zink")) panfrost,r300,r600,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl,zink"))
((target-arm32?) ((target-arm32?)
;; This includes more drivers than "auto": r300, r600 ;; This includes more drivers than "auto": r300, r600
'("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\ '("-Dgallium-drivers=etnaviv,freedreno,lima,nouveau,\
panfrost,r300,r600,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl,zink")) panfrost,r300,r600,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl,zink"))
((or (target-ppc64le?) (target-ppc32?) (target-riscv64?)) ((or (target-ppc64le?) (target-ppc32?) (target-riscv64?))
;; This include more drivers than "auto": svga ;; This include more drivers than "auto": svga

1
gnu/packages/python-xyz.scm
View file

@ -10987,6 +10987,7 @@ (define-public python-pyvips
a multithreaded image-processing system with low memory needs.") a multithreaded image-processing system with low memory needs.")
(license license:expat))) (license license:expat)))
;; WARNING: This package is a dependency of mesa.
(define-public python-pycparser (define-public python-pycparser
(package (package
(name "python-pycparser") (name "python-pycparser")