From e56f6db1d8017b973be3a4572a6543d5de3a48d4 Mon Sep 17 00:00:00 2001 From: Sean Gillies Date: Tue, 9 Aug 2022 10:25:34 -0600 Subject: [PATCH] Ensure zstd is built before tiff Resolves #87 --- CHANGES.md | 4 ++++ config.sh | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index aa8e649..a3d7ef4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,10 @@ Changes ======= +## 2022-08-09 + +* Ensure zstd is built before tiff (#87). + ## 2022-05-20 Library version changes: diff --git a/config.sh b/config.sh index c41f542..3ee543a 100644 --- a/config.sh +++ b/config.sh @@ -132,6 +132,7 @@ function get_cmake { function build_tiff { if [ -e tiff-stamp ]; then return; fi + build_zstd build_zlib build_jpeg ensure_xz @@ -349,6 +350,8 @@ function pre_build { suppress build_curl + suppress build_libwebp + suppress build_zstd suppress build_libpng suppress build_jpeg suppress build_openjpeg @@ -356,11 +359,9 @@ function pre_build { suppress build_sqlite build_proj suppress build_expat - suppress build_libwebp suppress build_geos suppress build_hdf5 suppress build_netcdf - suppress build_zstd if [ -n "$IS_OSX" ]; then export LDFLAGS="${LDFLAGS} -Wl,-rpath,${BUILD_PREFIX}/lib"