diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-06 19:45:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-06 19:45:35 (GMT) |
| commit | 98754fa9d12090f5e048fdb05cc5e9ce9111676f (patch) | |
| tree | 407e611b19ee551d8153779104022dd886a467e5 /bin/buildhdf5 | |
| parent | 29321bcafa9f1c6108bb92b5a844a9d4d9c2c8e7 (diff) | |
| download | hdf5-98754fa9d12090f5e048fdb05cc5e9ce9111676f.zip hdf5-98754fa9d12090f5e048fdb05cc5e9ce9111676f.tar.gz hdf5-98754fa9d12090f5e048fdb05cc5e9ce9111676f.tar.bz2 | |
[svn-r19050] Description:
Bring r18704:19049 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'bin/buildhdf5')
| -rwxr-xr-x | bin/buildhdf5 | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/bin/buildhdf5 b/bin/buildhdf5 index ac73df0..8ed4696 100755 --- a/bin/buildhdf5 +++ b/bin/buildhdf5 @@ -67,6 +67,7 @@ TIMESTAMP() QUIT() { + # print the closing time TIMESTAMP } @@ -234,7 +235,7 @@ trap QUIT 0 # MAKE=${MAKE:-'gmake'} export MAKE -CONFIGURE="CONFIG" +CONFIG_CMD="CONFIG" CONFIG_OP= # configure options CONFIG_ONLY=no # default is configure and build NOEXEC= # default to execute commands @@ -250,6 +251,7 @@ while [ $# -gt 0 ]; do ;; -szlib) LOCATE_SZLIB + CONFIG_OP="$CONFIG_OP $WITH_SZLIB" ;; -help) USAGE @@ -263,16 +265,16 @@ while [ $# -gt 0 ]; do SRCDIRLIST="$1" ;; -cxx) - CONFIG_CXX="--enable-cxx" + CONFIG_OP="$CONFIG_OP --enable-cxx" ;; -fortran) - CONFIG_FORTRAN="--enable-fortran" + CONFIG_OP="$CONFIG_OP --enable-fortran" ;; -pp) - CONFIG_PARALLEL="--enable-parallel" + CONFIG_OP="$CONFIG_OP --enable-parallel" ;; - *) # Quit parsing - break + *) # pass it as a configure option + CONFIG_OP="$CONFIG_OP $1" ;; esac shift @@ -296,14 +298,10 @@ if [ x-$SRCDIR = x-dummy ]; then exit 1 fi -# Setup Configure options -CONFIG_OP="$WITH_SZLIB $CONFIG_FORTRAN $CONFIG_CXX $CONFIG_PARALLEL" - # Configure # no configure if already done. if [ ! -f config.status ]; then - CONFIGURE="$CONFIGURE $CONFIG_OP $*" - STEP "Configure HDF5..." "$CONFIGURE" "#config" + STEP "Configure HDF5..." "$CONFIG_CMD $CONFIG_OP" "#config" else STEP "Configure Skipped" "echo Configure Skipped" "#config" fi @@ -324,4 +322,3 @@ STEP "Testing HDF5 parallel parts..." "$MAKE check-p" "#test-p" # all done echo "No Errors encountered" -TIMESTAMP |