Fix build of openblas. Revert hdf5 to version 1.10 until h5py support…

…s 1.12.
hpc4cmb · Jun 4, 2020 · 047f29a · 047f29a
1 parent ca46883
commit 047f29a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/pkgs/hdf5.sh b/pkgs/hdf5.sh
@@ -4,10 +4,10 @@ pkg="hdf5"
 pkgopts=$@
 cleanup=""
 
-version=1.12.0
+version=1.10.6
 
 pfile=hdf5-${version}.tar.bz2
-src=$(eval "@TOP_DIR@/tools/fetch_check.sh" https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-${version}/src/${pfile} ${pfile})
+src=$(eval "@TOP_DIR@/tools/fetch_check.sh" https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-${version}/src/${pfile} ${pfile})
 
 if [ "x${src}" = "x" ]; then
     echo "Failed to fetch ${pkg}" >&2
@@ -31,7 +31,6 @@ tar xjf ${src} \
        else echo "-O3"; fi) \
     ./configure \
     --enable-build-mode=production \
-    --with-default-api-version=v110 \
     --disable-silent-rules \
     --disable-parallel \
     --enable-cxx \
@@ -40,6 +39,16 @@ tar xjf ${src} \
     && make -j @MAKEJ@ >> ${log} 2>&1 \
     && make install >> ${log} 2>&1
 
+# These are the configure commands used for 1.12.x.  Restore them once h5py supports
+# the latest version:
+# ./configure \
+# --enable-build-mode=production \
+# --with-default-api-version=v110 \
+# --disable-silent-rules \
+# --disable-parallel \
+# --enable-cxx \
+# --disable-fortran \
+
 if [ $? -ne 0 ]; then
     echo "Failed to build ${pkg}" >&2
     exit 1

diff --git a/pkgs/openblas.sh b/pkgs/openblas.sh
@@ -22,14 +22,15 @@ rm -rf OpenBLAS-${version}
 tar xzf ${src} \
     && cd OpenBLAS-${version} \
     && cleanup="${cleanup} $(pwd)" \
-    && make USE_OPENMP=1 NO_SHARED=0 \
+    && make USE_OPENMP=1 \
     FC="@FC@" \
     MAKE_NB_JOBS="@MAKEJ@" \
     CC="@CC@" \
     CROSS=$(if [ "x@CROSS@" = x ]; then echo "0"; else echo "1"; fi) \
     COMMON_OPT="@CFLAGS@" \
-    FCOMMON_OPT="@FCFLAGS@" > ${log} 2>&1 \
-    && make NO_SHARED=1 PREFIX="@AUX_PREFIX@" install >> ${log} 2>&1
+    FCOMMON_OPT="@FCFLAGS@" \
+    LDFLAGS="@OPENMP_CFLAGS@ -lm" > ${log} 2>&1 \
+    && make PREFIX="@AUX_PREFIX@" install >> ${log} 2>&1
 
 if [ $? -ne 0 ]; then
     echo "Failed to build ${pkg}" >&2