[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/52: gnu: at-spi2-core: Don't cross-compile documentation.
From: |
guix-commits |
Subject: |
37/52: gnu: at-spi2-core: Don't cross-compile documentation. |
Date: |
Mon, 20 Sep 2021 07:19:37 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit b79bf535e48c9f0e012fa7a88a408945b2db9a01
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 13:59:19 2021 +0200
gnu: at-spi2-core: Don't cross-compile documentation.
* gnu/packages/gtk.scm
(at-spi2-core)[arguments]<#:configure-flags>: Set docs=false when
cross-compiling.
(at-spi2-core)[arguments]<#:phases>{move-documentation}: Remove when
cross-compiling.
---
gnu/packages/gtk.scm | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 12132db50c..227e0b4 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -724,9 +724,13 @@ scaled, composited, modified, saved, or rendered.")
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
- '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:configure-flags
- (list "-Ddocs=true")
+ ;; Generating documentation requires running binaries for the host
+ ;; on the build machine.
+ (list ,(if (%current-target-system)
+ "-Ddocs=false"
+ "-Ddocs=true"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-documentation-path
@@ -748,16 +752,18 @@ scaled, composited, modified, saved, or rendered.")
(("http://.*/docbookx\\.dtd")
(string-append xmldoc "/docbookx.dtd")))
#t)))
- (add-after 'install 'move-documentation
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc")))
- (copy-recursively
- (string-append out "/share/gtk-doc")
- (string-append doc "/share/gtk-doc"))
- (delete-file-recursively
- (string-append out "/share/gtk-doc")))
- #t))
+ ,@(if (%current-target-system)
+ '()
+ '((add-after 'install 'move-documentation
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (copy-recursively
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ (delete-file-recursively
+ (string-append out "/share/gtk-doc")))
+ #t))))
(add-after 'install 'check
(lambda _
(setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable
HOME
- 44/52: gnu: libxxf85vm: Add --disable-malloc0-returnsnull when necessary., (continued)
- 44/52: gnu: libxxf85vm: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 41/52: gnu: libxinerama: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 43/52: gnu: libxrandr: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 39/52: gnu: at-spi2-core: Add missing "bash-minimal" input., guix-commits, 2021/09/20
- 40/52: gnu: xorg: Unify --disable-malloc0-returnsnull code., guix-commits, 2021/09/20
- 42/52: gnu: libxi: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 45/52: gnu: Add pkg-config-for-build., guix-commits, 2021/09/20
- 48/52: gnu: libproxy: Don't run tests when cross-compiling., guix-commits, 2021/09/20
- 51/52: gnu: pango: Add bash-minimal input when cross-compiling., guix-commits, 2021/09/20
- 33/52: gnu: libthai: Add datrie as native-input when cross-compiling., guix-commits, 2021/09/20
- 37/52: gnu: at-spi2-core: Don't cross-compile documentation.,
guix-commits <=
- 50/52: gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling., guix-commits, 2021/09/20
- 49/52: gnu: gdk-pixbuf: Find docbook when cross-compiling., guix-commits, 2021/09/20
- 52/52: gnu: at-spi2-atk: Don't compile tests when cross-compiling., guix-commits, 2021/09/20
- 47/52: gnu: wayland: Find docbook-xml when cross-compiling., guix-commits, 2021/09/20
- 46/52: gnu: wayland: Find wayland-scanner when cross-compiling., guix-commits, 2021/09/20