ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 19:19:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: groff: Fix cross compilation.

Browse source 
* 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.
This commit is contained in:
Mathieu Othacehe 2019-03-06 10:33:29 +01:00
parent 534537e2ef
commit e45c333c55
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/groff.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -55,12 +56,28 @@ (define-public groff
;; from 'inputs'. ;; from 'inputs'.
(inputs `(("ghostscript" ,ghostscript))) (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) ("perl" ,perl)
("psutils" ,psutils) ("psutils" ,psutils)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(arguments (arguments
`(#:parallel-build? #f ; parallel build fails `(#: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 #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-relocatability (add-after 'unpack 'disable-relocatability
@ -115,7 +132,8 @@ (define-public groff-minimal
;; Omit the DVI, PS, PDF, and HTML backends. ;; Omit the DVI, PS, PDF, and HTML backends.
(inputs '()) (inputs '())
(native-inputs `(("bison" ,bison) (native-inputs `(("bison" ,bison)
("perl" ,perl))) ("perl" ,perl)
("groff" ,groff)))
(arguments (arguments
`(#:disallowed-references (,perl) `(#:disallowed-references (,perl)