[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v4 12/23] gnu: doxygen: Fix cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v4 12/23] gnu: doxygen: Fix cross-compilation. |
Date: |
Wed, 2 Oct 2019 11:58:53 +0200 |
* 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 19c42b00eb..eda8ca3368 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)
--
2.23.0
- [bug#36477] [PATCH v4 16/23] gnu: crda: Fix cross-compilation, (continued)
- [bug#36477] [PATCH v4 16/23] gnu: crda: Fix cross-compilation, Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 13/23] gnu: guile-gcrypt: Fix cross-compilation., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 18/23] gexp: Use cross extensions when cross-compiling., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 17/23] gnu: cmake: Fix cross-compilation., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 14/23] gnu: guile-sqlite3: Fix cross-compilation., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 19/23] utils: Use target-aarch64? and target-arm? helpers., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 12/23] gnu: doxygen: Fix cross-compilation.,
Mathieu Othacehe <=
- [bug#36477] [PATCH v4 20/23] build: vm: Fix arm32 support., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 21/23] system: vm: Add arm64 support., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 15/23] gnu: libnl: Move python outputs to separate packages., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 22/23] system: vm: Support cross-compilation., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 23/23] scripts: system: Add --target option., Mathieu Othacehe, 2019/10/02
- [bug#36477] [PATCH v4 00/23] System cross-compilation, Mathieu Othacehe, 2019/10/18