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
parent
9db34c41ac
commit
72e586fcae
|
@ -1171,7 +1171,7 @@ 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"
|
||||||
|
@ -1183,7 +1183,17 @@ application suites.")
|
||||||
;; 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
|
||||||
|
|
Reference in New Issue