guix-commits
[Top][All Lists]
Advanced

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

34/64: gnu: lvm2: Fix cross-compilation.


From: guix-commits
Subject: 34/64: gnu: lvm2: Fix cross-compilation.
Date: Fri, 23 Aug 2019 04:10:20 -0400 (EDT)

mothacehe pushed a commit to branch wip-cross-system
in repository guix.

commit 8ad66e8522f01ec7f2432ccce716b9495b92882c
Author: Mathieu Othacehe <address@hidden>
Date:   Mon Jul 8 14:12:32 2019 +0200

    gnu: lvm2: Fix cross-compilation.
    
    * gnu/packages/linux.scm (lvm2)[arguments]: Add cross-compilation specific
    configure-flags.
---
 gnu/packages/linux.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f0c0de6..0036b85 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2654,7 +2654,7 @@ time.")
     (inputs
      `(("udev" ,eudev)))
     (arguments
-     '(#:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'configure 'set-makefile-shell
            (lambda _
@@ -2689,7 +2689,12 @@ time.")
                                               (assoc-ref %outputs "out")
                                               "/lib,-rpath="
                                               (assoc-ref %outputs "out")
-                                              "/lib/device-mapper"))
+                                              "/lib/device-mapper")
+                               ;; This is needed when cross-compiling.
+                               ,@(if (%current-target-system)
+                                     '("ac_cv_func_malloc_0_nonnull=yes"
+                                       "ac_cv_func_realloc_0_nonnull=yes")
+                                     '()))
 
        ;; The tests use 'mknod', which requires root access.
        #:tests? #f))



reply via email to

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