[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/35: gnu: texinfo: Fix cross-compilation.
From: |
guix-commits |
Subject: |
19/35: gnu: texinfo: Fix cross-compilation. |
Date: |
Thu, 10 Oct 2019 11:33:18 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 5a2f58d52caea7a2a94a8ff18ef1ce9bebab7166
Author: Mathieu Othacehe <address@hidden>
Date: Wed Sep 4 18:25:17 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 befdd78..9b96d2d 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -41,8 +41,28 @@
(base32
"0rixv4c301djr0d0cnsxs8c1wjndi6bf9vi5axz6mwjkv80cmfcv"))))
(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 its 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.
- 34/35: gnu: libtool: Fix cross-compilation., (continued)
- 34/35: gnu: libtool: Fix cross-compilation., guix-commits, 2019/10/10
- 08/35: gnu: python: Further cross-compilation fixes., guix-commits, 2019/10/10
- 16/35: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/10/10
- 30/35: gnu: procps: Fix cross-compilation., guix-commits, 2019/10/10
- 29/35: gnu: nghttp2: Fix cross-compilation., guix-commits, 2019/10/10
- 09/35: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/10/10
- 03/35: gnu: python: Fix cross compilation., guix-commits, 2019/10/10
- 10/35: gnu: libgit2: Fix cross compilation., guix-commits, 2019/10/10
- 17/35: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/10/10
- 11/35: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/10/10
- 19/35: gnu: texinfo: Fix cross-compilation.,
guix-commits <=
- 15/35: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/10/10
- 32/35: gnu: mdadm: Fix cross-compilation., guix-commits, 2019/10/10
- 28/35: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/10/10
- 27/35: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/10/10
- 26/35: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/10/10
- 12/35: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/10/10
- 13/35: gnu: help2man: Fix cross-compilation., guix-commits, 2019/10/10
- 25/35: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/10/10
- 21/35: gnu: texinfo-4: Fix cross compilation, guix-commits, 2019/10/10
- 18/35: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/10/10