guix-commits
[Top][All Lists]
Advanced

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

02/05: gnu: slurm: Allow builds on 32-bit platforms.


From: guix-commits
Subject: 02/05: gnu: slurm: Allow builds on 32-bit platforms.
Date: Sun, 17 Nov 2019 17:15:01 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit bead6dcb58f8e3f907ae4421e42b9e5e26bb2c24
Author: Ludovic Courtès <address@hidden>
Date:   Sun Nov 17 22:31:42 2019 +0100

    gnu: slurm: Allow builds on 32-bit platforms.
    
    Fixes a regression introduced in
    7c96befa52ba127f68a066162258e600afbc73fb whereby ./configure would fail
    on 32-bit platforms due to 32-bit support being "deprecated".
    
    * gnu/packages/parallel.scm (slurm)[arguments]: Pass
    "--enable-deprecated" configure flag unless 'target-64bit?' returns
    true.
---
 gnu/packages/parallel.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 4fc2c9a..98721fe 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -32,6 +32,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix utils) #:select (target-64bit?))
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
@@ -158,7 +159,11 @@ and they are executed on lists of files, hosts, users or 
other items.")
             (string-append "--with-freeipmi=" (assoc-ref %build-inputs 
"freeipmi"))
             (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc"))
             (string-append "--with-json=" (assoc-ref %build-inputs "json-c"))
-            (string-append "--with-munge=" (assoc-ref %build-inputs "munge")))
+            (string-append "--with-munge=" (assoc-ref %build-inputs "munge"))
+
+            ;; 32-bit support is marked as deprecated and needs to be
+            ;; explicitly enabled.
+            ,@(if (target-64bit?) '() '("--enable-deprecated")))
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'autoconf



reply via email to

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