From: Mathieu Othacehe <m.othacehe@gmail.com>
To: 35244@debbugs.gnu.org
Cc: Mathieu Othacehe <m.othacehe@gmail.com>
Subject: [bug#35244] [PATCH 2/6] gnu: groff: Fix cross compilation.
Date: Fri, 12 Apr 2019 15:15:52 +0200 [thread overview]
Message-ID: <20190412131556.25282-2-m.othacehe@gmail.com> (raw)
In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com>
* gnu/packages/groff.scm (groff)[arguments]: Replace build phase to pass
GROFF_BIN_PATH and GROFFBIN variables when cross-compiling.
Also add native groff as an input.
---
gnu/packages/groff.scm | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index cf392f5468..6f01395691 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -53,6 +54,7 @@
;; own HTML doc, nor does it change its capabilities, so we removed netpbm
;; from 'inputs'.
+ (self-native-input? #t)
(inputs `(("ghostscript" ,ghostscript)))
(native-inputs `(("bison" ,bison)
("perl" ,perl)
@@ -65,7 +67,31 @@
(add-after 'unpack 'setenv
(lambda _
(setenv "GS_GENERATE_UUIDS" "0")
- #t)))))
+ #t))
+ (replace 'build
+ (lambda* (#:key
+ make-flags parallel-build?
+ native-inputs target #:allow-other-keys)
+ ;; When cross-compiling, native groff is needed, see:
+ ;; http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html
+ (let ((parallel
+ (if parallel-build?
+ `("-j" ,(number->string (parallel-job-count)))
+ '()))
+ (flags
+ (if target
+ (let ((groff (or
+ (assoc-ref native-inputs "groff")
+ (assoc-ref native-inputs "self"))))
+ (append
+ make-flags
+ (list
+ (string-append "GROFF_BIN_PATH=" groff)
+ (string-append "GROFFBIN=" groff
+ "/bin/groff"))))
+ make-flags)))
+ (apply invoke `("make" ,@parallel ,@flags)))
+ #t)))))
(synopsis "Typesetting from plain text mixed with formatting commands")
(description
"Groff is a typesetting package that reads plain text and produces
@@ -86,7 +112,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)
--
2.17.1
next prev parent reply other threads:[~2019-04-12 13:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 13:13 [bug#35244] [PATCH 0/6] Fix some cross-compilation issues Mathieu Othacehe
2019-04-12 13:15 ` [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation Mathieu Othacehe
2019-04-12 13:15 ` Mathieu Othacehe [this message]
2019-04-14 15:22 ` [bug#35244] [PATCH 2/6] gnu: groff: Fix cross compilation Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 3/6] gnu: glibc-utf8-locales: Always use native package Mathieu Othacehe
2019-04-14 15:24 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 4/6] gnu: firmware: Fix cross compilation Mathieu Othacehe
2019-04-14 15:26 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 5/6] linux-initrd: " Mathieu Othacehe
2019-04-14 15:29 ` Ludovic Courtès
2019-06-25 19:47 ` Mathieu Othacehe
2019-06-26 8:57 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 6/6] gnu: python: " Mathieu Othacehe
2019-04-14 15:27 ` Ludovic Courtès
2019-04-14 15:19 ` [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation Ludovic Courtès
2019-06-25 19:42 ` Mathieu Othacehe
2019-06-26 8:19 ` [bug#35244] [PATCH] gnu: perl: " Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190412131556.25282-2-m.othacehe@gmail.com \
--to=m.othacehe@gmail.com \
--cc=35244@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).