[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
42/64: gnu: doxygen: Fix cross-compilation.
From: |
guix-commits |
Subject: |
42/64: gnu: doxygen: Fix cross-compilation. |
Date: |
Fri, 23 Aug 2019 04:10:22 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 80f7f751ee30ce2ae240bd71cd030d09699903f9
Author: Mathieu Othacehe <address@hidden>
Date: Fri Aug 2 11:35:37 2019 +0200
gnu: doxygen: Fix cross-compilation.
* gnu/packages/documentation.scm (doxygen)[arguments]: Force cmake to use
iconv.h from cross-libc.
---
gnu/packages/documentation.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 19c42b0..eda8ca3 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017 Kei Kebreau <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,6 +32,7 @@
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages python)
#:use-module (gnu packages bison)
@@ -145,7 +147,15 @@ markup) can be customized and extended by the user.")
(inputs
`(("bash" ,bash-minimal)))
(arguments
- `(#:test-target "tests"
+ ;; Force cmake to use iconv header from cross-libc instead of the one
+ ;; from native libc.
+ `(,@(if (%current-target-system)
+ '(#:configure-flags
+ (list (string-append "-DICONV_INCLUDE_DIR="
+ (assoc-ref %build-inputs "cross-libc")
+ "/include")))
+ '())
+ #:test-target "tests"
#:phases (modify-phases %standard-phases
(add-before 'configure 'patch-sh
(lambda* (#:key inputs #:allow-other-keys)
- 46/64: gnu: texinfo-4: Fix cross compilation, (continued)
- 46/64: gnu: texinfo-4: Fix cross compilation, guix-commits, 2019/08/23
- 53/64: gnu: console-setup: Fix cross-compilation., guix-commits, 2019/08/23
- 58/64: gexp: Use cross extensions when cross-compiling., guix-commits, 2019/08/23
- 52/64: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/23
- 18/64: gnu: bc: Fix cross-compilation., guix-commits, 2019/08/23
- 08/64: gnu: python: Further cross-compilation fixes., guix-commits, 2019/08/23
- 21/64: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/08/23
- 23/64: gnu: help2man: Fix cross-compilation., guix-commits, 2019/08/23
- 30/64: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/08/23
- 33/64: gnu: eudev: Fix cross-compilation., guix-commits, 2019/08/23
- 42/64: gnu: doxygen: Fix cross-compilation.,
guix-commits <=
- 59/64: gexp: Pass target to compiled-modules in lower-gexp., guix-commits, 2019/08/23
- 43/64: gnu: guile-sqlite3: Fix cross-compilation., guix-commits, 2019/08/23
- 60/64: utils: Use target-arm64? and target-arm? helpers., guix-commits, 2019/08/23
- 48/64: gnu: libnl: Fix cross-compilation., guix-commits, 2019/08/23
- 56/64: linux-initrd: Use native gzip., guix-commits, 2019/08/23
- 54/64: gnu: mdadm: Fix cross-compilation., guix-commits, 2019/08/23
- 51/64: gnu: guile-wm: Fix cross-compilation., guix-commits, 2019/08/23
- 64/64: scripts: system: Add --target option., guix-commits, 2019/08/23
- 63/64: system: vm: Support cross-compilation., guix-commits, 2019/08/23