[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: zile: Fix cross-compilation.
From: |
guix-commits |
Subject: |
02/03: gnu: zile: Fix cross-compilation. |
Date: |
Wed, 11 Mar 2020 14:11:40 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 805ac43c94da049284bdc9981a897a89770cf86b
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Mar 11 18:58:48 2020 +0100
gnu: zile: Fix cross-compilation.
* gnu/packages/zile.scm (zile)[native-inputs]: Add THIS-PACKAGE when
cross-compiling.
[arguments]: Add phase when cross-compiling.
---
gnu/packages/zile.scm | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm
index eea0dba..2718232 100644
--- a/gnu/packages/zile.scm
+++ b/gnu/packages/zile.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014 Eric Bavier <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,7 +52,7 @@
"0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s"))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-/bin/sh
(lambda* (#:key inputs #:allow-other-keys)
@@ -60,7 +61,18 @@
(substitute* '("lib/spawni.c" "src/funcs.c")
(("/bin/sh")
(string-append bash "/bin/sh")))
- #t))))))
+ #t)))
+ ;; Zile generates its manual pages by calling the built Zile
+ ;; with the --help argument. That does not work when cross-
+ ;; compiling; use the native Zile added below in that case.
+ ,@(if (%current-target-system)
+ '((add-before 'build 'use-native-zile-for-documentation
+ (lambda _
+ (substitute* "build-aux/zile-help2man-wrapper"
+ (("src/zile")
+ (which "zile")))
+ #t)))
+ '()))))
(inputs
`(("boehm-gc" ,libgc)
("ncurses" ,ncurses)
@@ -68,6 +80,11 @@
(native-inputs
`(("perl" ,perl)
("help2man" ,help2man)
+ ;; When cross-compiling, Zile needs a native version of itself to
+ ;; generate the manual pages (see the related phase above).
+ ,@(if (%current-target-system)
+ `(("self" ,this-package))
+ '())
("pkg-config" ,pkg-config)))
(home-page "https://www.gnu.org/software/zile/";)
(synopsis "Lightweight Emacs clone")