nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: hdf5: Build a thread-safe library. 

* gnu/packages/maths.scm (hdf5)[arguments]: Pass "--enable-threadsafe
--with-pthread --enable-unsupported".
This commit is contained in:
Ludovic Courtès 2019-05-10 11:19:44 +02:00 committed by Ludovic Courtès
parent ae5de93ae2
commit 549d15712f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/maths.scm
View File

@ -781,7 +781,17 @@ incompatible with HDF5.")
`(;; Some of the users, notably Flann, need the C++ interface. `(;; Some of the users, notably Flann, need the C++ interface.
#:configure-flags '("--enable-cxx" #:configure-flags '("--enable-cxx"
"--enable-fortran" "--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 ;; Use -fPIC to allow the R bindings to link with the static libraries
#:make-flags (list "CFLAGS=-fPIC" #:make-flags (list "CFLAGS=-fPIC"
"CXXFLAGS=-fPIC") "CXXFLAGS=-fPIC")
@ -1093,7 +1103,9 @@ Swath).")
(arguments (arguments
(substitute-keyword-arguments (package-arguments hdf5) (substitute-keyword-arguments (package-arguments hdf5)
((#:configure-flags flags) ((#:configure-flags flags)
``("--enable-parallel" ,@(delete "--enable-cxx" ,flags))) ``("--enable-parallel"
,@(delete "--enable-cxx"
(delete "--enable-threadsafe" ,flags))))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'build 'mpi-setup (add-after 'build 'mpi-setup