[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: grub: Cross-compile for mips64el-linux.
From: |
guix-commits |
Subject: |
02/02: gnu: grub: Cross-compile for mips64el-linux. |
Date: |
Mon, 16 Nov 2020 15:41:01 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 34a6f123514b5677d442ed7cd609ff01534904b8
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Nov 16 22:36:15 2020 +0200
gnu: grub: Cross-compile for mips64el-linux.
* gnu/packages/bootloaders.scm (grub)[arguments]: Add custom phase to
set BUILD_FREETYPE_* flags.
[native-inputs]: Add freetype.
---
gnu/packages/bootloaders.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 1da8a7b..12bc393 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -134,6 +134,19 @@
(string-append (assoc-ref inputs "console-setup")
"/bin/ckbcomp ")))
#t))
+ (add-after 'unpack 'set-freetype-variables
+ ;; These variables need to be set to the native versions
+ ;; of the dependencies because they are used to build
+ ;; programs which are executed during build time.
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (let ((freetype (assoc-ref (or native-inputs inputs)
"freetype")))
+ (setenv "BUILD_FREETYPE_LIBS"
+ (string-append "-L" freetype
+ "/lib -lfreetype"))
+ (setenv "BUILD_FREETYPE_CFLAGS"
+ (string-append "-I" freetype
+ "/include/freetype2")))
+ #t))
(add-before 'check 'disable-flaky-test
(lambda _
;; This test is unreliable. For more information, see:
@@ -196,6 +209,7 @@
("flex" ,flex)
("texinfo" ,texinfo)
("help2man" ,help2man)
+ ("freetype" ,freetype) ; native version needed for build-grub-mkfont
;; XXX: When building GRUB 2.02 on 32-bit x86, we need a binutils
;; capable of assembling 64-bit instructions. However, our default