guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: criu: Fix building on armhf-linux.


From: guix-commits
Subject: 01/02: gnu: criu: Fix building on armhf-linux.
Date: Tue, 8 Jan 2019 05:29:52 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 49fe965d28d497f234b032e9a170fb0b503d0204
Author: Efraim Flashner <address@hidden>
Date:   Tue Jan 8 10:45:01 2019 +0200

    gnu: criu: Fix building on armhf-linux.
    
    * gnu/packages/virtualization.scm (criu)[arguments]: Hardcode the arm
    version in the Makefile.
---
 gnu/packages/virtualization.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 274f827..be3c3aa 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <address@hidden>
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017, 2018. 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2017 Alex Vong <address@hidden>
 ;;; Copyright © 2017 Andy Patterson <address@hidden>
@@ -681,6 +681,9 @@ domains, their live performance and resource utilization 
statistics.")
                      (string-append (assoc-ref inputs "libnl")
                                     "/include/libnl3:"
                                     (getenv "C_INCLUDE_PATH")))
+             ;; Hardcode arm version detection
+             (substitute* "Makefile"
+               (("ARMV.*:=.*") "ARMV := 7\n"))
              ;; Prevent xmlto from failing the install phase.
              (substitute* "Documentation/Makefile"
                (("XMLTO.*:=.*")



reply via email to

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