guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

08/17: gnu: dtc: Cross compile.


From: guix-commits
Subject: 08/17: gnu: dtc: Cross compile.
Date: Mon, 16 Nov 2020 08:12:38 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 6cc86492dbec84a3d50ea395395332ed864de2ae
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Nov 16 12:43:57 2020 +0200

    gnu: dtc: Cross compile.
    
    * gnu/packages/bootloaders.scm (dtc)[arguments]: Use cc-for-target in
    make-flags. Add custom phase to use correct pkg-config for target.
---
 gnu/packages/bootloaders.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index e3e4928..3c30395 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -425,7 +425,7 @@ menu to select one of the installed operating systems.")
      `(("python" ,python)))
     (arguments
      `(#:make-flags
-       (list "CC=gcc"
+       (list (string-append "CC=" ,(cc-for-target))
 
              ;; /bin/fdt{get,overlay,put} need help finding libfdt.so.1.
              (string-append "LDFLAGS=-Wl,-rpath="
@@ -436,6 +436,15 @@ menu to select one of the installed operating systems.")
              "INSTALL=install")
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-pkg-config
+           (lambda _
+             (substitute* '("Makefile"
+                            "tests/run_tests.sh")
+               (("pkg-config")
+                (or (which "pkg-config")
+                    (string-append ,(%current-target-system)
+                                   "-pkg-config"))))
+             #t))
          (delete 'configure))))         ; no configure script
     (home-page "https://www.devicetree.org";)
     (synopsis "Compiles device tree source files")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]