diff --git a/CHANGELOG b/CHANGELOG index f63c0e0c..41d249d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +3.2.2 - 2021-02-02 + * Update zlib to Latest + * Fix hd5 to use local zlib + * Fix tclcl installation of zlib + * Fixes on doxygen and minor improvements + 3.2.0 - 2020-26-10 * Various fixes on uwApplication * Improvements and new features on uwpolling diff --git a/DESERT_Framework/Installer/installDESERT_LOCAL.sh b/DESERT_Framework/Installer/installDESERT_LOCAL.sh index b22079a0..15c3649b 100755 --- a/DESERT_Framework/Installer/installDESERT_LOCAL.sh +++ b/DESERT_Framework/Installer/installDESERT_LOCAL.sh @@ -336,7 +336,7 @@ build_TCLCL() { --build=${HOST} \ --with-tcl=../tcl-${TCL_VERSION}/ \ --with-tcl-ver=8.4 \ - --with-zlib=../zlib-${ZLIB_VERSION} \ + --with-zlib=${DEST_FOLDER} \ --exec-prefix=${DEST_FOLDER} \ >> "${currentBuildLog}/tclcl-${TCLCL_VERSION}-$*.log" 2>&1 if [ $? -ne 0 ] ; then @@ -724,6 +724,7 @@ build_HDF5() { --host=${ARCH} \ --build=${HOST} \ --enable-shared \ + --with-zlib=${DEST_FOLDER} \ --prefix=${DEST_FOLDER} \ >> "${currentBuildLog}/hdf5-${HDF5_VERSION}-$*.log" 2>&1 if [ $? -ne 0 ]; then diff --git a/DESERT_Framework/commonVariables.sh b/DESERT_Framework/commonVariables.sh index f53651d5..c0c9496d 100755 --- a/DESERT_Framework/commonVariables.sh +++ b/DESERT_Framework/commonVariables.sh @@ -65,7 +65,7 @@ export LOG_DIR_BUILD="" export PATCHES_TAR_FILE=${ROOT_DESERT}/patches.tar.gz export PATCHES_DIR=patches -export ZLIB_VERSION=1.2.7 +export ZLIB_VERSION=1.2.11 export ZLIB_TAR_FILE=${ROOT_DESERT}/zlib-${ZLIB_VERSION}.tar.gz export ZLIB_DIR=zlib-${ZLIB_VERSION} diff --git a/DESERT_Framework/zlib-1.2.11.tar.gz b/DESERT_Framework/zlib-1.2.11.tar.gz new file mode 100755 index 00000000..7e75a8b8 Binary files /dev/null and b/DESERT_Framework/zlib-1.2.11.tar.gz differ