From 549d15712fdc1f58ce0dd11117eb79535ec19f2c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 May 2019 11:19:44 +0200 Subject: gnu: hdf5: Build a thread-safe library. * gnu/packages/maths.scm (hdf5)[arguments]: Pass "--enable-threadsafe --with-pthread --enable-unsupported". --- gnu/packages/maths.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 59bf101a42..e682746b9e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -781,7 +781,17 @@ (define-public hdf5 `(;; Some of the users, notably Flann, need the C++ interface. #:configure-flags '("--enable-cxx" "--enable-fortran" - "--enable-fortran2003") + "--enable-fortran2003" + + ;; Build a thread-safe library. Unfortunately, + ;; 'configure' invites you to either turn off C++, + ;; Fortran, and the high-level interface (HL), or + ;; to pass '--enable-unsupported'. Debian + ;; packagers chose to pass '--enable-unsupported' + ;; and we follow their lead here. + "--enable-threadsafe" + "--with-pthread" + "--enable-unsupported") ;; Use -fPIC to allow the R bindings to link with the static libraries #:make-flags (list "CFLAGS=-fPIC" "CXXFLAGS=-fPIC") @@ -1093,7 +1103,9 @@ (define-public hdf5-parallel-openmpi (arguments (substitute-keyword-arguments (package-arguments hdf5) ((#:configure-flags flags) - ``("--enable-parallel" ,@(delete "--enable-cxx" ,flags))) + ``("--enable-parallel" + ,@(delete "--enable-cxx" + (delete "--enable-threadsafe" ,flags)))) ((#:phases phases) `(modify-phases ,phases (add-after 'build 'mpi-setup -- cgit v1.2.3