GNU bug report logs - #31802
[PATCH] gnu: ldb: Fix build on 32-bit systems.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31802 in the body.
You can then email your comments to 31802 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: guix-patches <at> gnu.org
Cc: Marius Bakke <mbakke <at> fastmail.com>
Subject: [PATCH] gnu: ldb: Fix build on 32-bit systems.
Date: Tue, 12 Jun 2018 19:55:33 +0200

* 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.
---
 gnu/packages/samba.scm | 9 +++++++--
 guix/utils.scm         | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index abbfdd83c..e10f00a83 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")
diff --git a/guix/utils.scm b/guix/utils.scm
index e9efea586..81aee0bf8 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -77,6 +77,7 @@
             package-name->name+version
             target-mingw?
             target-arm32?
+            target-64bit?
             version-compare
             version>?
             version>=?
@@ -474,6 +475,10 @@ a character other than '@'."
 (define (target-arm32?)
   (string-prefix? "arm" (or (%current-target-system) (%current-system))))
 
+(define (target-64bit?)
+  (let ((system (or (%current-target-system) (%current-system))))
+    (any (cut string-prefix? <> system) '("x86_64" "aarch64" "ppc64"))))
+
 (define version-compare
   (let ((strverscmp
          (let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
-- 
2.17.1

Message #8 received at 31802 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 31802 <at> debbugs.gnu.org
Subject: Re: [bug#31802] [PATCH] gnu: ldb: Fix build on 32-bit systems.
Date: Thu, 14 Jun 2018 22:31:27 +0200

Marius Bakke <mbakke <at> fastmail.com> skribis:

> * 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.

LGTM, thanks!

Ludo'.

Message #11 received at 31802 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 31802 <at> debbugs.gnu.org
Subject: Re: [bug#31802] [PATCH] gnu: ldb: Fix build on 32-bit systems.
Date: Sat, 16 Jun 2018 21:39:06 +0200

[Message part 1 (text/plain, inline)]

ludo <at> gnu.org (Ludovic Courtès) writes:

> Marius Bakke <mbakke <at> fastmail.com> skribis:
>
>> * 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.
>
> LGTM, thanks!

Great, thanks for checking.  Pushed!

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 31802 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 31802 <at> debbugs.gnu.org
Subject: Re: [bug#31802] [PATCH] gnu: ldb: Fix build on 32-bit systems.
Date: Sat, 16 Jun 2018 21:39:37 +0200

[Message part 1 (text/plain, inline)]

ludo <at> gnu.org (Ludovic Courtès) writes:

> Marius Bakke <mbakke <at> fastmail.com> skribis:
>
>> * 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.
>
> LGTM, thanks!

I also added mips64 as suggested by Efraim on IRC.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.