mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: mesa: Fix building on aarch64-linux.
* gnu/packages/gl.scm (mesa)[inputs]: When building for aarch64-linux use clang-18 and llvm-18 instead of llvm-for-mesa. [native-inputs]: When building for aarch64-linux add libclc. [arguments]: Adjust the 'disable-failing-test phase when building for aarch64-linux to skip a test. (mesa-opencl)[native-inputs]: When building for aarch64-linux don't add clang-15. * gnu/packages/check.scm (python-lit), * gnu/packages/llvm.scm (libclc), * gnu/packages/vulkan.scm (spirv-llvm-translator): Add a note about it being a dependency for mesa. Change-Id: I0bf5ab019ffd0626ad2d0c38bafceec401e3c886
This commit is contained in:
parent
8a2a088f29
commit
d10ab3d397
4 changed files with 38 additions and 21 deletions
|
@ -2755,6 +2755,7 @@ seamlessly into your existing Python unit testing work flow.")
|
||||||
programs, something like CSmith, a random generator of C programs.")
|
programs, something like CSmith, a random generator of C programs.")
|
||||||
(license license:mpl2.0)))
|
(license license:mpl2.0)))
|
||||||
|
|
||||||
|
;; WARNING: This package is a dependency of mesa.
|
||||||
(define-public python-lit
|
(define-public python-lit
|
||||||
(package
|
(package
|
||||||
(name "python-lit")
|
(name "python-lit")
|
||||||
|
|
|
@ -321,19 +321,24 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
libxxf86vm
|
libxxf86vm
|
||||||
xorgproto))
|
xorgproto))
|
||||||
(inputs
|
(inputs
|
||||||
|
(append
|
||||||
|
(if (target-aarch64?)
|
||||||
|
(list clang-18
|
||||||
|
llvm-18)
|
||||||
|
(list llvm-for-mesa))
|
||||||
(list elfutils ;libelf required for r600 when using llvm
|
(list elfutils ;libelf required for r600 when using llvm
|
||||||
expat
|
expat
|
||||||
(force libva-without-mesa)
|
(force libva-without-mesa)
|
||||||
libxml2
|
libxml2
|
||||||
libxrandr
|
libxrandr
|
||||||
libxvmc
|
libxvmc
|
||||||
llvm-for-mesa
|
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
wayland
|
wayland
|
||||||
wayland-protocols
|
wayland-protocols
|
||||||
`(,zstd "lib")))
|
`(,zstd "lib"))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(cons* bison
|
(append
|
||||||
|
(list bison
|
||||||
flex
|
flex
|
||||||
gettext-minimal
|
gettext-minimal
|
||||||
glslang
|
glslang
|
||||||
|
@ -341,7 +346,10 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
python-libxml2 ;for OpenGL ES 1.1 and 2.0 support
|
python-libxml2 ;for OpenGL ES 1.1 and 2.0 support
|
||||||
python-mako
|
python-mako
|
||||||
python-wrapper
|
python-wrapper
|
||||||
(@ (gnu packages base) which)
|
(@ (gnu packages base) which))
|
||||||
|
(if (target-aarch64?)
|
||||||
|
(list libclc)
|
||||||
|
'())
|
||||||
(if (%current-target-system)
|
(if (%current-target-system)
|
||||||
(list cmake-minimal-cross
|
(list cmake-minimal-cross
|
||||||
pkg-config-for-build
|
pkg-config-for-build
|
||||||
|
@ -465,6 +473,10 @@ svga,swrast,virgl,zink")))
|
||||||
;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091).
|
;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091).
|
||||||
`((substitute* "src/util/meson.build"
|
`((substitute* "src/util/meson.build"
|
||||||
((".*'tests/u_debug_stack_test.cpp',.*") ""))))
|
((".*'tests/u_debug_stack_test.cpp',.*") ""))))
|
||||||
|
("aarch64-linux"
|
||||||
|
;; Disable some of the llvmpipe tests.
|
||||||
|
`((substitute* "src/gallium/drivers/llvmpipe/meson.build"
|
||||||
|
(("'lp_test_format', ") ""))))
|
||||||
("armhf-linux"
|
("armhf-linux"
|
||||||
;; Disable some of the llvmpipe tests.
|
;; Disable some of the llvmpipe tests.
|
||||||
`((substitute* "src/gallium/drivers/llvmpipe/meson.build"
|
`((substitute* "src/gallium/drivers/llvmpipe/meson.build"
|
||||||
|
@ -587,8 +599,10 @@ from software emulation to complete hardware acceleration for modern GPUs.")
|
||||||
(modify-inputs (package-inputs mesa)
|
(modify-inputs (package-inputs mesa)
|
||||||
(prepend libclc)))
|
(prepend libclc)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
(if (target-aarch64?)
|
||||||
|
(package-native-inputs mesa)
|
||||||
(modify-inputs (package-native-inputs mesa)
|
(modify-inputs (package-native-inputs mesa)
|
||||||
(prepend clang-15)))))
|
(prepend clang-15))))))
|
||||||
|
|
||||||
(define-public mesa-opencl-icd
|
(define-public mesa-opencl-icd
|
||||||
(package/inherit mesa-opencl
|
(package/inherit mesa-opencl
|
||||||
|
|
|
@ -1949,6 +1949,7 @@ standard C++ library.")
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list clang-6 llvm-6 libcxxabi-6))))
|
(list clang-6 llvm-6 libcxxabi-6))))
|
||||||
|
|
||||||
|
;; WARNING: This package is a dependency of mesa.
|
||||||
(define-public libclc
|
(define-public libclc
|
||||||
(package
|
(package
|
||||||
(name "libclc")
|
(name "libclc")
|
||||||
|
|
|
@ -154,6 +154,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.")
|
||||||
SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.")
|
SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
;; WARNING: This package is a dependency of mesa.
|
||||||
(define-public spirv-llvm-translator
|
(define-public spirv-llvm-translator
|
||||||
(package
|
(package
|
||||||
(name "spirv-llvm-translator")
|
(name "spirv-llvm-translator")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue