me
/
guix
Archived
1
0
Fork 0
Code

gnu: gtk: Fix build on aarch64. 

* gnu/packages/gtk.scm (gtk)[arguments]<#:test-options>: Rename failing
test suite to match upstream change on aarch64-linux.

Change-Id: Ibdf03a94e71f72283a093cba6d5a328004defa5c
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
master
Timotej Lazar 2024-06-25 15:14:16 +02:00 committed by Ludovic Courtès
parent 9db34c41ac
commit 72e586fcae
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnu/packages/gtk.scm
View File

@ -1171,19 +1171,29 @@ application suites.")
'("-Dgtk_doc=false") '("-Dgtk_doc=false")
'("-Dgtk_doc=true")) '("-Dgtk_doc=true"))
"-Dman-pages=true") "-Dman-pages=true")
#:test-options '(list "--setup=x11" ;defaults to wayland #:test-options #~(list "--setup=x11" ;defaults to wayland
;; Use the same test options as upstream uses for ;; Use the same test options as upstream uses for
;; their CI. ;; their CI.
"--suite=gtk" "--suite=gtk"
"--no-suite=failing" "--no-suite=failing"
"--no-suite=flaky" "--no-suite=flaky"
"--no-suite=headless" ; requires mutter… "--no-suite=headless" ; requires mutter…
"--no-suite=gsk-compare-broadway" "--no-suite=gsk-compare-broadway"
;; These seem to fail on aarch64, and Debian has ;; These seem to fail on aarch64, and Debian has
;; also disabled these, see: ;; also disabled these, see:
;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075 ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075
"--no-suite=wayland_failing" "--no-suite=wayland_failing"
"--no-suite=wayland_gles_failing")
;; The correct name of the test that fails on
;; AArch64 is 'wayland_gles2_failing':
;; <https://gitlab.gnome.org/GNOME/gtk/-/commit/b916c4dac1075572>.
;; The second arm of the 'if' is kept to avoid a
;; rebuild on other architectures. TODO: Remove
;; on the next rebuild cycle.
#$(if (and (not (%current-target-system))
(string=? (%current-system) "aarch64-linux"))
"--no-suite=wayland_gles2_failing"
"--no-suite=wayland_gles_failing"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file