Skip to content

GitLab

Unverified Commit 68a4af04 authored by Matthew Brett's avatar Matthew Brett Committed by GitHub
Browse files

Merge pull request #277 from tomkooij/fix_hdf5_threadsafe 

Fix typo in --enable-threadsafe flag
parents b6ed746c cfa5d3f7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
library_builders.sh
View file @ 68a4af04
...@@ -227,7 +227,8 @@ function build_hdf5 { ...@@ -227,7 +227,8 @@ function build_hdf5 {
local short=$(echo $HDF5_VERSION | awk -F "." '{printf "%d.%d", $1, $2}') local short=$(echo $HDF5_VERSION | awk -F "." '{printf "%d.%d", $1, $2}')
fetch_unpack $hdf5_url/hdf5-$short/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_VERSION.tar.gz fetch_unpack $hdf5_url/hdf5-$short/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_VERSION.tar.gz
(cd hdf5-$HDF5_VERSION \ (cd hdf5-$HDF5_VERSION \
&& ./configure --with-szlib=$BUILD_PREFIX --prefix=$BUILD_PREFIX --enable-thread-safe \ && ./configure --with-szlib=$BUILD_PREFIX --prefix=$BUILD_PREFIX \
--enable-threadsafe --enable-unsupported --with-pthread=yes \
&& make -j4 \ && make -j4 \
&& make install) && make install)
touch hdf5-stamp touch hdf5-stamp
......
tests/test_library_builders.sh
View file @ 68a4af04
...@@ -52,6 +52,7 @@ fi ...@@ -52,6 +52,7 @@ fi
suppress build_ragel suppress build_ragel
suppress build_cfitsio suppress build_cfitsio
suppress build_new_zlib suppress build_new_zlib
suppress build_hdf5
[ ${MB_PYTHON_VERSION+x} ] || ingest "\$MB_PYTHON_VERSION is not set" [ ${MB_PYTHON_VERSION+x} ] || ingest "\$MB_PYTHON_VERSION is not set"
[ "$MB_PYTHON_VERSION" == "$PYTHON_VERSION" ] || ingest "\$MB_PYTHON_VERSION must be equal to \$PYTHON_VERSION" [ "$MB_PYTHON_VERSION" == "$PYTHON_VERSION" ] || ingest "\$MB_PYTHON_VERSION must be equal to \$PYTHON_VERSION"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment