[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/22: gnu: doxygen: Fix cross-compilation.
From: |
guix-commits |
Subject: |
12/22: gnu: doxygen: Fix cross-compilation. |
Date: |
Fri, 15 Nov 2019 11:32:45 -0500 (EST) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 21b0ed1f9d6fec4cd49e2fa9cf94a07552ff7cf9
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)
- branch core-updates updated (2387e2f -> e4696c6), guix-commits, 2019/11/15
- 01/22: gnu: openssl: Fix cross-compilation., guix-commits, 2019/11/15
- 02/22: gnu: cmake: Fix cross-compilation., guix-commits, 2019/11/15
- 05/22: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/11/15
- 10/22: gnu: swig: Fix cross-compilation., guix-commits, 2019/11/15
- 11/22: gnu: git: Fix cross-compilation., guix-commits, 2019/11/15
- 04/22: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/11/15
- 17/22: gnu: cmake: Fix cross-compilation., guix-commits, 2019/11/15
- 13/22: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/11/15
- 12/22: gnu: doxygen: Fix cross-compilation.,
guix-commits <=
- 08/22: gnu: bdb: Fix cross-compilation., guix-commits, 2019/11/15
- 07/22: gnu: eudev: Fix cross-compilation., guix-commits, 2019/11/15
- 18/22: utils: Use target-aarch64? and target-arm? helpers., guix-commits, 2019/11/15
- 15/22: gnu: libnl: Move python outputs to separate packages., guix-commits, 2019/11/15
- 09/22: gnu: openldap: Fix cross-compilation., guix-commits, 2019/11/15
- 19/22: build: vm: Fix arm32 support., guix-commits, 2019/11/15
- 21/22: system: vm: Support cross-compilation., guix-commits, 2019/11/15
- 20/22: system: vm: Add arm64 support., guix-commits, 2019/11/15
- 06/22: gnu: boost: Fix cross-compilation., guix-commits, 2019/11/15
- 22/22: scripts: system: Add --target option., guix-commits, 2019/11/15