Erik Schnetter:

The enclosed patch cleans up the HDF5 build script. Tested on many architectures.


git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@21 fb53df36-e548-4a1e-8150-ab98cbd5e786

1 files changed, 23 insertions, 19 deletions

diff --git a/HDF5.sh b/HDF5.sh
index 721900a..6602ac5 100644
--- a/HDF5.sh
+++ b/HDF5.sh
@@ -57,29 +57,14 @@ if [ -z "${HDF5_DIR}" -o "${HDF5_DIR}" = 'BUILD' ]; then
     echo "END MESSAGE"
     
     # Set locations
+    THORN=HDF5
     NAME=hdf5-1.8.5-patch1
     SRCDIR=$(dirname $0)
-    BUILD_DIR=${SCRATCH_BUILD}/build/${NAME}
-    INSTALL_DIR=${SCRATCH_BUILD}/external/${NAME}
-    DONE_FILE=${SCRATCH_BUILD}/done/${NAME}
+    BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
+    INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
     HDF5_DIR=${INSTALL_DIR}
     
-    # Set up environment
-    if [ "${F90}" = "none" ]; then
-        echo 'BEGIN MESSAGE'
-        echo 'No Fortran 90 compiler available. Building HDF5 library without Fortran support.'
-        echo 'END MESSAGE'
-        unset FC
-        unset FCFLAGS
-    else
-        export FC="${F90}"
-        export FCFLAGS="${F90FLAGS}"
-    fi
-    unset LIBS
-    if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then
-        export OBJECT_MODE=64
-    fi
-    
 (
     exec >&2                    # Redirect stdout to stderr
     set -x                      # Output commands
@@ -97,6 +82,22 @@ if [ -z "${HDF5_DIR}" -o "${HDF5_DIR}" = 'BUILD' ]; then
         # Should we use gtar or tar?
         TAR=$(gtar --help > /dev/null 2> /dev/null && echo gtar || echo tar)
         
+        # Set up environment
+        if [ "${F90}" = "none" ]; then
+            echo 'BEGIN MESSAGE'
+            echo 'No Fortran 90 compiler available. Building HDF5 library without Fortran support.'
+            echo 'END MESSAGE'
+            unset FC
+            unset FCFLAGS
+        else
+            export FC="${F90}"
+            export FCFLAGS="${F90FLAGS}"
+        fi
+        unset LIBS
+        if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then
+            export OBJECT_MODE=64
+        fi
+        
         echo "HDF5: Preparing directory structure..."
         mkdir build external done 2> /dev/null || true
         rm -rf ${BUILD_DIR} ${INSTALL_DIR}
@@ -116,6 +117,9 @@ if [ -z "${HDF5_DIR}" -o "${HDF5_DIR}" = 'BUILD' ]; then
         
         echo "HDF5: Installing..."
         ${MAKE} install
+        
+#        echo "HDF5: Cleaning up..."
+#        ${MAKE} clean
         popd
         
         date > ${DONE_FILE}