[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/31: gnu: texinfo: Fix cross-compilation.
From: |
guix-commits |
Subject: |
11/31: gnu: texinfo: Fix cross-compilation. |
Date: |
Mon, 8 Jul 2019 05:43:39 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit e00fc93fe7e7aaa66ee3186e4d4da24033940c3a
Author: Mathieu Othacehe <address@hidden>
Date: Tue Jul 2 07:45:26 2019 +0200
gnu: texinfo: Fix cross-compilation.
* gnu/packages/texinfo.scm (texinfo)[arguments]: Do not reset environment
before running configure with the native compiler, in a cross-compilation
context,
[inputs]: move perl from here ...
[native-inputs]: ... to here. Also add ncurses that is needed in a
cross-compilation context to build texinfo native tools.
---
gnu/packages/texinfo.scm | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index fa98bd5..36bb913 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -42,8 +42,28 @@
(base32
"0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"))))
(build-system gnu-build-system)
- (inputs `(("ncurses" ,ncurses)
- ("perl" ,perl)))
+ (arguments
+ ;; When cross-compiling, the package is configured twice: once with the
+ ;; native compiler and once with the cross-compiler. During the configure
+ ;; with the native compiler, the environment is reset. This leads to
+ ;; multiple environment variables missing. Do not reset the environment
+ ;; to prevent that.
+ `(,@(if (%current-target-system)
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'fix-cross-configure
+ (lambda _
+ (substitute* "configure"
+ (("env -i")
+ "env "))
+ #t))))
+ '())))
+ (inputs `(("ncurses" ,ncurses)))
+ ;; When cross-compiling, texinfo will build some of it's own binaries with
+ ;; the native compiler. This means ncurses is needed both in both inputs
+ ;; and native-inputs.
+ (native-inputs `(("perl" ,perl)
+ ("ncurses" ,ncurses)))
(native-search-paths
;; This is the variable used by the standalone Info reader.
- branch wip-cross-system created (now c09e15a), guix-commits, 2019/07/08
- 13/31: gnu: libgit2: Fix cross compilation., guix-commits, 2019/07/08
- 05/31: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/07/08
- 11/31: gnu: texinfo: Fix cross-compilation.,
guix-commits <=
- 18/31: gnu: bc: Fix cross-compilation., guix-commits, 2019/07/08
- 15/31: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/07/08
- 20/31: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/07/08
- 10/31: gnu: openssl: Fix cross-compilation., guix-commits, 2019/07/08
- 09/31: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/07/08
- 21/31: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/07/08
- 08/31: gnu: python: Fix cross-compilation., guix-commits, 2019/07/08
- 24/31: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/07/08
- 31/31: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/07/08
- 25/31: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/07/08