diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-12 19:51:23 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-16 21:35:25 +0200 |
| commit | 259341cf93de80533d212cb73e5e652aa4bc716c (patch) | |
| tree | ea6fc37bb2759fabc88f54ce6feb98aa51c1575e /gnu | |
| parent | 406c83f78d4c7851743bb0f82a9de02c8afa63f3 (diff) | |
| download | gnu-guix-259341cf93de80533d212cb73e5e652aa4bc716c.tar gnu-guix-259341cf93de80533d212cb73e5e652aa4bc716c.tar.gz | |
gnu: ldb: Fix build on 32-bit systems.
* guix/utils.scm (target-64bit?): New procedure.
* gnu/packages/samba.scm (ldb)[inputs]: Only add LMDB on 64-bit systems.
[arguments]: Make #:tests? conditional on LMDB availability.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/samba.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index abbfdd83c4..e10f00a83b 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -362,7 +362,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. @@ -382,7 +385,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") |