From: Fabian Castelli <fabian.castelli@kit.edu>
Date: Mon, 7 Jun 2021 14:05:07 +0000 (+0200)
Subject: Update package hdf5
X-Git-Tag: v9.4.0-r1~11^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfaecf0e2e900e90268f519fd3cc97524f43054d;p=candi.git

Update package hdf5
---

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 58d399b..8f0cee3 100644
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -147,10 +147,9 @@ if [ ! -z "${P4EST_DIR}" ]; then
       -D P4EST_DIR=${P4EST_DIR}"
 fi
 
-# hdf5
+########################################
+# HDF5
 if [[ ${PACKAGES_OFF} =~ 'hdf5' ]]; then
-    # Disable hdf5 for deal.II, if a special DEAL_II_CONFOPTS together with
-    # the dealii-prepare loop forces hdf5 to be off
     if [ ! -z "${HDF5_DIR}" ]; then
         cecho ${INFO} "deal.II: unset HDF5_DIR due to forced DEAL_II_WITH_HDF5:BOOL=OFF option"
         unset HDF5_DIR
@@ -159,10 +158,8 @@ fi
 
 if [ ! -z "${HDF5_DIR}" ]; then
     cecho ${INFO} "deal.II: configuration with HDF5"
-    CONFOPTS="\
-        ${CONFOPTS} \
-        -D DEAL_II_WITH_HDF5:BOOL=ON \
-        -D HDF5_DIR=${HDF5_DIR}"
+    CONFOPTS="${CONFOPTS} \
+      -D DEAL_II_WITH_HDF5:BOOL=ON"
 fi
 
 ########################################
diff --git a/deal.II-toolchain/packages/hdf5.package b/deal.II-toolchain/packages/hdf5.package
index 50a1c2b..97cf59f 100644
--- a/deal.II-toolchain/packages/hdf5.package
+++ b/deal.II-toolchain/packages/hdf5.package
@@ -1,11 +1,15 @@
-#MAJORVER=1.10
-#MINORVER=5
-#CHECKSUM=e115eeb66e944fa7814482415dd21cc4
+################################################################################
+## HDF5                                                                       ##
+################################################################################
 
 MAJORVER=1.10
 MINORVER=7
 CHECKSUM=006ed785942f4ed9a6f31556d0ef8ba5
 
+# MAJORVER=1.10
+# MINORVER=5
+# CHECKSUM=e115eeb66e944fa7814482415dd21cc4
+
 VERSION=${MAJORVER}.${MINORVER}
 NAME=hdf5-${VERSION}
 SOURCE=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${MAJORVER}/${NAME}/src/
@@ -23,9 +27,8 @@ package_specific_register () {
 package_specific_conf () {
     # Generate configuration file
     CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
-    rm -f $CONFIG_FILE
+    rm -f ${CONFIG_FILE}
     echo "
 export HDF5_DIR=${INSTALL_PATH}
 " >> $CONFIG_FILE
 }
-