ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: font-gnu-unifont: Cross-compile binaries.

Browse source 
* gnu/packages/fonts.scm (font-gnu-unifont)[arguments]: Set CC to
CC-FOR-TARGET in #:make-flags, where it has an effect.  Remove it
from the environment, where it did not.  Respect #:make-flags during
installation.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-21 01:01:30 +02:00
parent d750f6a89f
commit 10c856214e
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/fonts.scm
View file

@ -760,15 +760,14 @@ (define-public font-gnu-unifont
"psf" ; PSF (console) version
"bin")) ; Utilities to manipulate '.hex' format
(arguments
'(#:tests? #f ; no check target
`(#:tests? #f ; no check target
#:make-flags
(list (string-append "CC=" ,(cc-for-target)))
#:phases
(modify-phases %standard-phases
(replace
'configure
(lambda _ (setenv "CC" "gcc")))
(replace
'install
(lambda* (#:key outputs #:allow-other-keys)
(delete 'configure)
(replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys)
(let* ((ttf (string-append (assoc-ref outputs "out")
"/share/fonts/truetype"))
(pcf (string-append (assoc-ref outputs "pcf")
@ -776,12 +775,12 @@ (define-public font-gnu-unifont
(psf (string-append (assoc-ref outputs "psf")
"/share/consolefonts"))
(bin (assoc-ref outputs "bin")))
(invoke "make"
(string-append "PREFIX=" bin)
(string-append "TTFDEST=" ttf)
(string-append "PCFDEST=" pcf)
(string-append "CONSOLEDEST=" psf)
"install")
(apply invoke "make" "install"
(string-append "PREFIX=" bin)
(string-append "TTFDEST=" ttf)
(string-append "PCFDEST=" pcf)
(string-append "CONSOLEDEST=" psf)
make-flags)
;; Move Texinfo file to the right place.
(mkdir (string-append bin "/share/info"))
(invoke "gzip" "-9n" "doc/unifont.info")