guix-patches
[Top][All Lists]
Advanced

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

bug#26294: [PATCH] gnu: rocksdb: Disable tests on 32-bit systems.


From: Ludovic Courtès
Subject: bug#26294: [PATCH] gnu: rocksdb: Disable tests on 32-bit systems.
Date: Mon, 17 Apr 2017 23:29:18 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux)

Hello,

Marius Bakke <address@hidden> skribis:

> * gnu/packages/databases.scm (rocksdb)[arguments]: Make #:tests? conditional.
> Delete unnecessary 'build' phase.
> ---
>  gnu/packages/databases.scm | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index b87e8a210..e73635910 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -533,12 +533,20 @@ types are supported, as is encryption.")
>                    #t))))
>      (build-system gnu-build-system)
>      (arguments
> -     '(#:make-flags (list "CC=gcc"
> +     `(#:make-flags (list "CC=gcc"
>                            ;; Make the resulting library position-independent 
> so the
>                            ;; static version can be included in shared 
> objects.
>                            "EXTRA_CXXFLAGS=-fPIC"
>                            (string-append "INSTALL_PATH="
>                                           (assoc-ref %outputs "out")))
> +       ;; Many tests fail on 32-bit platforms. There are multiple reports 
> about
> +       ;; this upstream, but it's not going to be supported any time soon.
> +       #:tests? (let ((system ,(or (%current-target-system)
> +                                   (%current-system)))
> +                      (supported-systems '("x86_64-linux" "aarch64-linux")))
> +                  (if (member system supported-systems)
> +                      #t
> +                      #f))

This doesn’t work because (%current-target-system) is a GNU triplet,
like “arm-linux-gnueabihf”, whereas (%current-system) is a “system
type”, like “armhf-linux”.

Instead you should use ‘string-prefix?’ or similar.

Other than that, I think it should go in!

Thanks,
Ludo’.





reply via email to

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