[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/52: gnu: json-glib: Don't build gtk documentation when cross-compilin
From: |
guix-commits |
Subject: |
31/52: gnu: json-glib: Don't build gtk documentation when cross-compiling. |
Date: |
Mon, 20 Sep 2021 07:19:35 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit b67ea49e2c918e712a3c9b215044cd9b830bb849
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 10:54:19 2021 +0200
gnu: json-glib: Don't build gtk documentation when cross-compiling.
* gnu/packages/gnome.scm
(json-glib)[arguments]<#:configue-flags>: Set gtk_doc=disables when
cross-compiling.
(json-glib)[arguments]<#:phases>{move-docs}: Don't run when
cross-compiling
...
(json-glib)[arguments]<#:phases>{stub-docs}: ... instead, create an empty
directory where the documentation would be.
---
gnu/packages/gnome.scm | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fbf3677..989d5e7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4595,7 +4595,12 @@ configuration storage systems.")
#:configure-flags
(list
"-Ddocs=true"
- "-Dman=true")
+ "-Dman=true"
+ ,@(if (%current-target-system)
+ ;; If enabled, gtkdoc-scangobj will try to execute a
+ ;; cross-compiled binary.
+ '("-Dgtk_doc=disabled")
+ '()))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook
@@ -4619,15 +4624,21 @@ configuration storage systems.")
'inputs) "docbook-xsl")
"/xml/xsl/docbook-xsl-1.79.2/"))))
#t))
- (add-after 'install 'move-docs
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc")))
- (mkdir-p (string-append doc "/share"))
- (rename-file
- (string-append out "/share/gtk-doc")
- (string-append doc "/share/gtk-doc"))
- #t))))))
+ ;; When cross-compiling, there are no docs to move.
+ ,(if (%current-target-system)
+ '(add-after 'install 'stub-docs
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; The daemon doesn't like empty output paths.
+ (mkdir (assoc-ref outputs "doc"))))
+ '(add-after 'install 'move-docs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ #t)))))))
(native-inputs
`(("docbook-xml" ,docbook-xml-4.3)
("docbook-xsl" ,docbook-xsl)
- 04/52: gnu: libcap: Fix cross-compilation build failures., (continued)
- 04/52: gnu: libcap: Fix cross-compilation build failures., guix-commits, 2021/09/20
- 05/52: gnu: perl: Find 'bash' when cross-compiling., guix-commits, 2021/09/20
- 08/52: gnu: mozjs-60: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 10/52: build-system/meson: Allow 'configure-flags' to be a G-exp., guix-commits, 2021/09/20
- 22/52: gnu: iso-codes: Move inputs to native-inputs when cross-compiling., guix-commits, 2021/09/20
- 14/52: gnu: gobject-introspection: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 20/52: gnu: gamin: Recognise aarch64 as architecture when cross-compiling., guix-commits, 2021/09/20
- 26/52: gnu: heimdal: Use the cross-compiled bash in "su"., guix-commits, 2021/09/20
- 29/52: gnu: json-glib: Add missing 'bash-minimal' input., guix-commits, 2021/09/20
- 30/52: gnu: json-glib: Find docbook inputs when cross-compiling., guix-commits, 2021/09/20
- 31/52: gnu: json-glib: Don't build gtk documentation when cross-compiling.,
guix-commits <=
- 36/52: gnu: avahi: Use the cross-compiled bash., guix-commits, 2021/09/20
- 38/52: gnu: at-spi2-core: Find docbook when cross-compiling., guix-commits, 2021/09/20
- 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