From bead6dcb58f8e3f907ae4421e42b9e5e26bb2c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Nov 2019 22:31:42 +0100 Subject: [PATCH] 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 4fc2c9afb4..98721fe1ff 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -32,6 +32,7 @@ (define-module (gnu packages parallel) #: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 @@ (define-public slurm (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