nckx pushed a commit to branch master
in repository guix.
commit 10c856214ece958bb9873153005df111f711b179
Author: Tobias Geerinckx-Rice <[email protected]>
AuthorDate: Thu Oct 21 01:01:30 2021 +0200
gnu: font-gnu-unifont: Cross-compile binaries.
* 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.
---
gnu/packages/fonts.scm | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index a9a06e7..c3a2120 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -760,15 +760,14 @@ for use at smaller text sizes")))
"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 @@ for use at smaller text sizes")))
(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")
