guix-commits
[Top][All Lists]
Advanced

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

03/07: gnu: grub: Add support for Loongson-based machines.


From: Mark H. Weaver
Subject: 03/07: gnu: grub: Add support for Loongson-based machines.
Date: Thu, 24 Mar 2016 03:21:58 +0000

mhw pushed a commit to branch wip-loongson2f
in repository guix.

commit 3bc4daa0dc5bc73aee51cd85a151294b9afcb7f0
Author: Mark H Weaver <address@hidden>
Date:   Thu Feb 4 12:15:47 2016 -0500

    gnu: grub: Add support for Loongson-based machines.
    
    * gnu/packages/grub.scm (grub)[arguments]: Disable tests on MIPS.
      [native-inputs]: Remove qemu and xorriso (for tests) on MIPS.
---
 gnu/packages/grub.scm |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index e9512d2..c7875eb 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -90,7 +90,13 @@
                 "093gzr3m8i63fvlahih2g7493zk01d18hp9yhiby4z1m2435aiqs"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-werror")
+     `(,@(if (string-prefix? "mips" (or (%current-target-system)
+                                        (%current-system)))
+             ;; XXX Disable tests on MIPS, to work around the fact that our
+             ;; QEMU package is currently broken on MIPS.
+             '(#:tests? #f)
+             '())
+       #:configure-flags '("--disable-werror")
        #:phases (modify-phases %standard-phases
                   (add-after
                    'unpack 'patch-stuff
@@ -131,8 +137,14 @@
 
        ;; Dependencies for the test suite.  The "real" QEMU is needed here,
        ;; because several targets are used.
-       ("qemu" ,qemu-for-tests)
-       ("xorriso" ,xorriso)))
+       ;;
+       ;; XXX Don't add these on MIPS, since our QEMU package is currently
+       ;; broken on MIPS.
+       ,@(if (not (string-prefix? "mips" (or (%current-target-system)
+                                             (%current-system))))
+             `(("qemu" ,qemu-for-tests)
+               ("xorriso" ,xorriso))
+             '())))
     (home-page "http://www.gnu.org/software/grub/";)
     (synopsis "GRand Unified Boot loader")
     (description



reply via email to

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