guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: ldb: Fix build on 32-bit systems.


From: guix-commits
Subject: 02/02: gnu: ldb: Fix build on 32-bit systems.
Date: Thu, 6 Dec 2018 10:03:13 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit 3d53869e302540cb9a80cdcbbabea2b67200c0c5
Author: Marius Bakke <address@hidden>
Date:   Tue Jun 12 19:51:23 2018 +0200

    gnu: ldb: Fix build on 32-bit systems.
    
    * gnu/packages/samba.scm (ldb)[inputs]: Only add LMDB on 64-bit systems.
    [arguments]: Make #:tests? conditional on LMDB availability.
---
 gnu/packages/samba.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 66d0b5a..fd9bdd9 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -365,7 +365,10 @@ many event types, including timers, signals, and the 
classic file descriptor eve
                   #t))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases
+     '(;; LMDB is only supported on 64-bit systems, yet the test suite
+       ;; requires it.
+       #:tests? (assoc-ref %build-inputs "lmdb")
+       #:phases
        (modify-phases %standard-phases
          (replace 'configure
            ;; ldb use a custom configuration script that runs waf.
@@ -385,7 +388,9 @@ many event types, including timers, signals, and the 
classic file descriptor eve
      `(("talloc" ,talloc)
        ("tdb" ,tdb)))
     (inputs
-     `(("lmdb" ,lmdb)
+     `(,@(if (target-64bit?)
+             `(("lmdb" ,lmdb))
+             '())
        ("popt" ,popt)
        ("tevent" ,tevent)))
     (synopsis "LDAP-like embedded database")



reply via email to

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