[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/22: gnu: groff: Fix cross compilation.
From: |
guix-commits |
Subject: |
03/22: gnu: groff: Fix cross compilation. |
Date: |
Fri, 15 Nov 2019 11:32:44 -0500 (EST) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit e45c333c5569c42debbf3cd888b251d1a1e209e4
Author: Mathieu Othacehe <address@hidden>
Date: Wed Mar 6 10:33:29 2019 +0100
gnu: groff: Fix cross compilation.
* gnu/packages/groff.scm (groff)[native-inputs]: Add self,
[arguments]: set GROFF_BIN_PATH and GROFFBIN variables when
cross-compiling.
(groff-minimal)[native-inputs]: Add groff.
---
gnu/packages/groff.scm | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index 98f1791..5fe353a 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2019 Efraim Flashner <address@hidden>
;;; Copyright © 2019 Eric Bavier <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -55,12 +56,28 @@
;; from 'inputs'.
(inputs `(("ghostscript" ,ghostscript)))
- (native-inputs `(("bison" ,bison)
+
+ ;; When cross-compiling, this package depends upon a native install of
+ ;; itself.
+ (native-inputs `(,@(if (%current-target-system)
+ `(("self" ,this-package))
+ '())
+ ("bison" ,bison)
("perl" ,perl)
("psutils" ,psutils)
("texinfo" ,texinfo)))
(arguments
`(#:parallel-build? #f ; parallel build fails
+ ,@(if (%current-target-system)
+ `(#:make-flags
+ ;; In groff-minimal package, that inherits from this package,
+ ;; we'll need to locate "groff" instead of "self".
+ (let ((groff (or (assoc-ref %build-host-inputs "groff")
+ (assoc-ref %build-host-inputs "self"))))
+ (list
+ (string-append "GROFF_BIN_PATH=" groff)
+ (string-append "GROFFBIN=" groff "/bin/groff"))))
+ '())
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-relocatability
@@ -115,7 +132,8 @@ is usually the formatter of \"man\" documentation pages.")
;; Omit the DVI, PS, PDF, and HTML backends.
(inputs '())
(native-inputs `(("bison" ,bison)
- ("perl" ,perl)))
+ ("perl" ,perl)
+ ("groff" ,groff)))
(arguments
`(#:disallowed-references (,perl)
- 07/22: gnu: eudev: Fix cross-compilation., (continued)
- 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
- 16/22: gnu: crda: Fix cross-compilation, guix-commits, 2019/11/15
- 03/22: gnu: groff: Fix cross compilation.,
guix-commits <=
- 14/22: gnu: guile-sqlite3: Fix cross-compilation., guix-commits, 2019/11/15