From 4aa0e1ac9341bd101a74ef88be948a37fe4658f7 Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Thu, 17 Aug 2023 13:12:04 -0400 Subject: [PATCH] Changed the dependency fetcher to only download the dependencies if they aren't already there, otherwise run make distclean --- buildscripts/_build_getopts.sh | 12 ++++----- buildscripts/build_dependencies.sh | 40 +++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/buildscripts/_build_getopts.sh b/buildscripts/_build_getopts.sh index 3e071ef14..6b5b7fad9 100755 --- a/buildscripts/_build_getopts.sh +++ b/buildscripts/_build_getopts.sh @@ -63,12 +63,12 @@ if [ -z ${DEPENDENCY_ENV_VARS+x} ]; then read -r CC CXX FC F77 CPP < <($CMD) unset CMD - LD_LIBRARY_PATH="${PREFIX}/lib" - CPPFLAGS="-isystem ${PREFIX}/include" - LDFLAGS="-L${PREFIX}/lib -fPIE" - CPATH="${PREFIX}/include}" - CFLAGS="-Wno-unused-but-set-variable -fPIC" - LIBS="-lgomp" + LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}" + CPPFLAGS="${CPPFLAGS} -isystem ${PREFIX}/include" + LDFLAGS="${LDFLAGS} -L${PREFIX}/lib -fPIE" + CPATH="${CPATH} ${PREFIX}/include}" + CFLAGS="${CFLAGS} -Wno-unused-but-set-variable -fPIC" + LIBS="${LIBS} -lgomp" if [ $COMPILER = "GNU-Mac" ]; then LDFLAGS="${LDFLAGS} -Wl,-no_compact_unwind" diff --git a/buildscripts/build_dependencies.sh b/buildscripts/build_dependencies.sh index bb536224e..ccdebd40b 100755 --- a/buildscripts/build_dependencies.sh +++ b/buildscripts/build_dependencies.sh @@ -17,16 +17,48 @@ set -a . ${SCRIPT_DIR}/_build_getopts.sh ARGS=$@ +ZLIB_VER="1.2.13" +HDF5_VER="1.14.1-2" +NC_VER="4.9.2" +NF_VER="4.6.1" + printf "*********************************************************\n" printf "* FETCHING DEPENCENCY SOURCES *\n" printf "*********************************************************\n" printf "Copying files to ${DEPENDENCY_DIR}\n" mkdir -p ${DEPENDENCY_DIR} cd $DEPENDENCY_DIR -wget -qO- https://www.zlib.net/zlib-1.2.13.tar.gz | tar xvz -wget -qO- https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.1/src/hdf5-1.14.1-2.tar.gz | tar xvz -wget -qO- https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.9.2.tar.gz | tar xvz -wget -qO- https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.6.1.tar.gz | tar xvz +if [ -d ${DEPENDENCY_DIR}/zlib-${ZLIB_VER} ]; then + cd ${DEPENDENCY_DIR}/zlib-${ZLIB_VER} + make distclean + cd ${DEPENDENCY_DIR} +else + wget -qO- https://www.zlib.net/zlib-${ZLIB_VER}.tar.gz | tar xvz +fi + +if [ -d ${DEPENDENCY_DIR}/hdf5-${HDF5_VER} ]; then + cd ${DEPENDENCY_DIR}/hdf5-${HDF5_VER} + make distclean + cd ${DEPENDENCY_DIR} +else + wget -qO- https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.1/src/hdf5-${HDF5_VER}.tar.gz | tar xvz +fi + +if [ -d ${DEPENDENCY_DIR}/netcdf-c-${NC_VER} ]; then + cd ${DEPENDENCY_DIR}/netcdf-c-${NC_VER} + make distclean + cd ${DEPENDENCY_DIR} +else + wget -qO- https://github.com/Unidata/netcdf-c/archive/refs/tags/v${NC_VER}.tar.gz | tar xvz +fi + +if [ -d ${DEPENDENCY_DIR}/netcdf-fortran-${NF_VER} ]; then + cd ${DEPENDENCY_DIR}/netcdf-fortran-${NF_VER} + make distclean + cd ${DEPENDENCY_DIR} +else + wget -qO- https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v${NF_VER}.tar.gz | tar xvz +fi cd $ROOT_DIR printf "*********************************************************\n" printf "* STARTING DEPENDENCY BUILD *\n"