From 7e490aab0910e2144fc837d47ff4f9dde52a0f1f Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Thu, 13 Jul 2023 21:57:11 +0200 Subject: [PATCH 01/31] [GDAL] Bump to v3.7.1 --- G/GDAL/build_tarballs.jl | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 07e9a5d96ef..8f4779af21d 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -3,27 +3,26 @@ using BinaryBuilder, Pkg name = "GDAL" -upstream_version = v"3.6.2" -version_offset = v"1.0.0" +upstream_version = v"3.7.1" +version_offset = v"0.0.0" version = VersionNumber(upstream_version.major * 100 + version_offset.major, upstream_version.minor * 100 + version_offset.minor, upstream_version.patch * 100 + version_offset.patch) # Collection of sources required to build GDAL sources = [ - ArchiveSource("https://github.com/OSGeo/gdal/releases/download/v$upstream_version/gdal-$upstream_version.tar.gz", - "cd5bf004af85b88414676b0d5694d3192414e556961ee3d47164f3298078a818"), + ArchiveSource("https://github.com/OSGeo/gdal.git", + "68da5257b139d4d80162cf83fdb8c6d26ead412f"), ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz", "2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"), ] # Bash recipe for building across all platforms script = raw""" -cd $WORKSPACE/srcdir/gdal-*/ +cd $WORKSPACE/srcdir/gdal install_license LICENSE.TXT -mkdir build -cd build +mkdir build && cd build if [[ "${target}" == *-freebsd* ]]; then # Our FreeBSD libc has `environ` as undefined symbol, so the linker will @@ -133,19 +132,19 @@ hdf5_platforms = expand_cxxstring_abis(hdf5_platforms) # Dependencies that must be installed before this package can be built dependencies = [ Dependency("GEOS_jll"; compat="~3.11"), - Dependency("PROJ_jll"; compat="~900.100"), + Dependency("PROJ_jll"; compat="~900.200"), Dependency("Zlib_jll"), Dependency("SQLite_jll"), Dependency("LibPQ_jll"), Dependency("OpenJpeg_jll"), Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), - Dependency("Libtiff_jll"; compat="4.3"), + Dependency("Libtiff_jll"; compat="4.5.1"), Dependency("libgeotiff_jll"; compat="100.700.100"), - Dependency("LibCURL_jll"; compat="7.73"), + Dependency("LibCURL_jll"; compat="7.73,8") Dependency("NetCDF_jll"; compat="400.902.5", platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package - Dependency("HDF5_jll"; compat="~1.12", platforms=hdf5_platforms), + Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), Dependency("Arrow_jll"; compat="10"), ] From c92f998d77456a04c0942636a1134178cc3a37a6 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Thu, 13 Jul 2023 22:06:01 +0200 Subject: [PATCH 02/31] Missing comma --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 8f4779af21d..568ca9682f3 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -141,7 +141,7 @@ dependencies = [ Dependency("Zstd_jll"), Dependency("Libtiff_jll"; compat="4.5.1"), Dependency("libgeotiff_jll"; compat="100.700.100"), - Dependency("LibCURL_jll"; compat="7.73,8") + Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; compat="400.902.5", platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), From 1f7ca46c73a4e5156871641583ef333e972cdfa7 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Thu, 13 Jul 2023 22:08:20 +0200 Subject: [PATCH 03/31] Switch to gitsource --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 568ca9682f3..903e5d25580 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -11,7 +11,7 @@ version = VersionNumber(upstream_version.major * 100 + version_offset.major, # Collection of sources required to build GDAL sources = [ - ArchiveSource("https://github.com/OSGeo/gdal.git", + GitSource("https://github.com/OSGeo/gdal.git", "68da5257b139d4d80162cf83fdb8c6d26ead412f"), ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz", "2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"), From 866638f1ac6805d29c0d20c00576b8fb33e33afe Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Thu, 13 Jul 2023 23:03:46 +0200 Subject: [PATCH 04/31] Update G/GDAL/build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 903e5d25580..3c573f966bd 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -132,7 +132,7 @@ hdf5_platforms = expand_cxxstring_abis(hdf5_platforms) # Dependencies that must be installed before this package can be built dependencies = [ Dependency("GEOS_jll"; compat="~3.11"), - Dependency("PROJ_jll"; compat="~900.200"), + Dependency("PROJ_jll"; compat="~900.200.100"), Dependency("Zlib_jll"), Dependency("SQLite_jll"), Dependency("LibPQ_jll"), From fcb11fa8e33b9edf4ba5f8a788e43ba6c327f9e1 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Thu, 13 Jul 2023 23:11:49 +0200 Subject: [PATCH 05/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 3c573f966bd..c10b53a376d 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -140,7 +140,7 @@ dependencies = [ Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), Dependency("Libtiff_jll"; compat="4.5.1"), - Dependency("libgeotiff_jll"; compat="100.700.100"), + Dependency("libgeotiff_jll"; compat="100.700.101"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; compat="400.902.5", platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package From 793041fa6d6838068ddc4f1b602a896058b425d9 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 08:27:34 +0200 Subject: [PATCH 06/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index c10b53a376d..094eb56d813 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -142,7 +142,7 @@ dependencies = [ Dependency("Libtiff_jll"; compat="4.5.1"), Dependency("libgeotiff_jll"; compat="100.700.101"), Dependency("LibCURL_jll"; compat="7.73,8"), - Dependency("NetCDF_jll"; compat="400.902.5", platforms=hdf5_platforms), + Dependency("NetCDF_jll"; compat="400.902.20", platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), Dependency("Arrow_jll"; compat="10"), From 81e76ddf02dad5187b587aacc6cce384783f624e Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 08:32:41 +0200 Subject: [PATCH 07/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 094eb56d813..d1687a094f2 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -142,7 +142,7 @@ dependencies = [ Dependency("Libtiff_jll"; compat="4.5.1"), Dependency("libgeotiff_jll"; compat="100.700.101"), Dependency("LibCURL_jll"; compat="7.73,8"), - Dependency("NetCDF_jll"; compat="400.902.20", platforms=hdf5_platforms), + Dependency("NetCDF_jll"; compat="400.902.208", platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), Dependency("Arrow_jll"; compat="10"), From f25332abdbc7d83388a5c8921c2a7cf52c4fe0c1 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 08:39:03 +0200 Subject: [PATCH 08/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index d1687a094f2..0fdd0e4a407 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -139,7 +139,7 @@ dependencies = [ Dependency("OpenJpeg_jll"), Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), - Dependency("Libtiff_jll"; compat="4.5.1"), + Dependency("Libtiff_jll"; compat="4.4.0"), Dependency("libgeotiff_jll"; compat="100.700.101"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; compat="400.902.208", platforms=hdf5_platforms), From dc7a80cb9562eef7c80bac22b1ebc253f21f03e2 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 08:45:52 +0200 Subject: [PATCH 09/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 0fdd0e4a407..d1687a094f2 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -139,7 +139,7 @@ dependencies = [ Dependency("OpenJpeg_jll"), Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), - Dependency("Libtiff_jll"; compat="4.4.0"), + Dependency("Libtiff_jll"; compat="4.5.1"), Dependency("libgeotiff_jll"; compat="100.700.101"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; compat="400.902.208", platforms=hdf5_platforms), From 653aa7bf82ef6a408409c3d8e73ebbbed76e8843 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 08:52:14 +0200 Subject: [PATCH 10/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index d1687a094f2..d0eb172a42f 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -139,8 +139,8 @@ dependencies = [ Dependency("OpenJpeg_jll"), Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), - Dependency("Libtiff_jll"; compat="4.5.1"), - Dependency("libgeotiff_jll"; compat="100.700.101"), + Dependency("Libtiff_jll"), + Dependency("libgeotiff_jll"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; compat="400.902.208", platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package From 35150dcf4286c81018d82700223cb7004122190e Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 08:59:08 +0200 Subject: [PATCH 11/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index d0eb172a42f..868351adb1f 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -132,7 +132,7 @@ hdf5_platforms = expand_cxxstring_abis(hdf5_platforms) # Dependencies that must be installed before this package can be built dependencies = [ Dependency("GEOS_jll"; compat="~3.11"), - Dependency("PROJ_jll"; compat="~900.200.100"), + Dependency("PROJ_jll"), Dependency("Zlib_jll"), Dependency("SQLite_jll"), Dependency("LibPQ_jll"), From ebfb545485a2af17aa466bb3c117642c2d2d8bfd Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 09:03:00 +0200 Subject: [PATCH 12/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 868351adb1f..16cd30c9c93 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -131,7 +131,7 @@ hdf5_platforms = expand_cxxstring_abis(hdf5_platforms) # Dependencies that must be installed before this package can be built dependencies = [ - Dependency("GEOS_jll"; compat="~3.11"), + Dependency("GEOS_jll"), Dependency("PROJ_jll"), Dependency("Zlib_jll"), Dependency("SQLite_jll"), @@ -142,9 +142,9 @@ dependencies = [ Dependency("Libtiff_jll"), Dependency("libgeotiff_jll"), Dependency("LibCURL_jll"; compat="7.73,8"), - Dependency("NetCDF_jll"; compat="400.902.208", platforms=hdf5_platforms), + Dependency("NetCDF_jll"; platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package - Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), + Dependency("HDF5_jll"; platforms=hdf5_platforms), Dependency("Arrow_jll"; compat="10"), ] From 12129fd01f306c7b0ad2495208e599bc77af280f Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 09:42:32 +0200 Subject: [PATCH 13/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 16cd30c9c93..513ffb843ea 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -30,6 +30,10 @@ if [[ "${target}" == *-freebsd* ]]; then # be a problem at runtime. The flag `-undefined` allows having undefined symbols. # The flag `-lexecinfo` fixes "undefined reference to `backtrace'". export LDFLAGS="-lexecinfo -undefined" + + # The above FreeBSD fix is not enough, trying to use gcc instead of clang: + CC=gcc + CXX=g++ fi if [[ "${target}" == x86_64-apple-darwin* ]]; then From 13f2dc19dfa935a59d2a12c8f7bb3c117de2c840 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:11:32 +0200 Subject: [PATCH 14/31] tweak ldflags --- G/GDAL/build_tarballs.jl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 513ffb843ea..4ded1ddceea 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -29,11 +29,7 @@ if [[ "${target}" == *-freebsd* ]]; then # complain if this symbol is used in the built library, even if this won't # be a problem at runtime. The flag `-undefined` allows having undefined symbols. # The flag `-lexecinfo` fixes "undefined reference to `backtrace'". - export LDFLAGS="-lexecinfo -undefined" - - # The above FreeBSD fix is not enough, trying to use gcc instead of clang: - CC=gcc - CXX=g++ + export LDFLAGS="-Wl,-lexecinfo -undefined" fi if [[ "${target}" == x86_64-apple-darwin* ]]; then From 2005c2f85c64d72fc77918852fe5e646ecf37afd Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:44:51 +0200 Subject: [PATCH 15/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 4ded1ddceea..7562835db11 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -29,7 +29,7 @@ if [[ "${target}" == *-freebsd* ]]; then # complain if this symbol is used in the built library, even if this won't # be a problem at runtime. The flag `-undefined` allows having undefined symbols. # The flag `-lexecinfo` fixes "undefined reference to `backtrace'". - export LDFLAGS="-Wl,-lexecinfo -undefined" + export LDFLAGS="-Wl,-lexecinfo,-undefined" fi if [[ "${target}" == x86_64-apple-darwin* ]]; then From 7584fdeea0f27e3324ee79e04c49708b320a6934 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:57:07 +0200 Subject: [PATCH 16/31] use gcc for freebsd --- G/GDAL/build_tarballs.jl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 7562835db11..d7b065d3e18 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -29,7 +29,13 @@ if [[ "${target}" == *-freebsd* ]]; then # complain if this symbol is used in the built library, even if this won't # be a problem at runtime. The flag `-undefined` allows having undefined symbols. # The flag `-lexecinfo` fixes "undefined reference to `backtrace'". - export LDFLAGS="-Wl,-lexecinfo,-undefined" + export LDFLAGS="-lexecinfo -undefined" +fi + +# Use GCC on FreeBSD +toolchain="$CMAKE_TARGET_TOOLCHAIN" +if [[ "${target}" == *-freebsd* ]]; then + toolchain="${CMAKE_TARGET_TOOLCHAIN%.*}_gcc.cmake" fi if [[ "${target}" == x86_64-apple-darwin* ]]; then From 02b76add6de5b7a38d3e10964e5fcb5688cb6125 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 14:26:58 +0200 Subject: [PATCH 17/31] add patch --- G/GDAL/build_tarballs.jl | 49 +++++++++---------- .../patches/bsd-environ-undefined-fix.patch | 27 ++++++++++ 2 files changed, 50 insertions(+), 26 deletions(-) create mode 100644 G/GDAL/bundled/patches/bsd-environ-undefined-fix.patch diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index d7b065d3e18..9d7168a5a65 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -15,6 +15,7 @@ sources = [ "68da5257b139d4d80162cf83fdb8c6d26ead412f"), ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz", "2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"), + DirectorySource("./bundled") ] # Bash recipe for building across all platforms @@ -30,12 +31,8 @@ if [[ "${target}" == *-freebsd* ]]; then # be a problem at runtime. The flag `-undefined` allows having undefined symbols. # The flag `-lexecinfo` fixes "undefined reference to `backtrace'". export LDFLAGS="-lexecinfo -undefined" -fi -# Use GCC on FreeBSD -toolchain="$CMAKE_TARGET_TOOLCHAIN" -if [[ "${target}" == *-freebsd* ]]; then - toolchain="${CMAKE_TARGET_TOOLCHAIN%.*}_gcc.cmake" + atomic_patch -p1 ../patches/bsd-environ-undefined-fix.patch fi if [[ "${target}" == x86_64-apple-darwin* ]]; then @@ -54,27 +51,27 @@ if [[ "${target}" == x86_64-apple-darwin* ]]; then fi CMAKE_FLAGS=(-DCMAKE_INSTALL_PREFIX=${prefix} --DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} --DCMAKE_PREFIX_PATH=${prefix} --DCMAKE_FIND_ROOT_PATH=${prefix} --DCMAKE_BUILD_TYPE=Release --DBUILD_PYTHON_BINDINGS=OFF --DBUILD_JAVA_BINDINGS=OFF --DBUILD_CSHARP_BINDINGS=OFF --DGDAL_USE_CURL=ON --DGDAL_USE_EXPAT=ON --DGDAL_USE_GEOTIFF=ON --DGDAL_USE_GEOS=ON --DGDAL_USE_OPENJPEG=ON --DGDAL_USE_SQLITE3=ON --DGDAL_USE_TIFF=ON --DGDAL_USE_ZLIB=ON --DGDAL_USE_ZSTD=ON --DGDAL_USE_POSTGRESQL=ON --DPostgreSQL_INCLUDE_DIR=${includedir} --DPostgreSQL_LIBRARY=${libdir}/libpq.${dlext} --DGDAL_USE_ARROW=ON --DGDAL_USE_PARQUET=ON) + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} + -DCMAKE_PREFIX_PATH=${prefix} + -DCMAKE_FIND_ROOT_PATH=${prefix} + -DCMAKE_BUILD_TYPE=Release + -DBUILD_PYTHON_BINDINGS=OFF + -DBUILD_JAVA_BINDINGS=OFF + -DBUILD_CSHARP_BINDINGS=OFF + -DGDAL_USE_CURL=ON + -DGDAL_USE_EXPAT=ON + -DGDAL_USE_GEOTIFF=ON + -DGDAL_USE_GEOS=ON + -DGDAL_USE_OPENJPEG=ON + -DGDAL_USE_SQLITE3=ON + -DGDAL_USE_TIFF=ON + -DGDAL_USE_ZLIB=ON + -DGDAL_USE_ZSTD=ON + -DGDAL_USE_POSTGRESQL=ON + -DPostgreSQL_INCLUDE_DIR=${includedir} + -DPostgreSQL_LIBRARY=${libdir}/libpq.${dlext} + -DGDAL_USE_ARROW=ON + -DGDAL_USE_PARQUET=ON) # NetCDF is the most restrictive dependency as far as platform availability, so we'll use it where applicable but disable it otherwise if ! find ${libdir} -name "libnetcdf*.${dlext}" -exec false '{}' +; then diff --git a/G/GDAL/bundled/patches/bsd-environ-undefined-fix.patch b/G/GDAL/bundled/patches/bsd-environ-undefined-fix.patch new file mode 100644 index 00000000000..685c0a15990 --- /dev/null +++ b/G/GDAL/bundled/patches/bsd-environ-undefined-fix.patch @@ -0,0 +1,27 @@ +diff --git a/gdal.cmake b/gdal.cmake +index e221f99b79..bfd00348f3 100644 +--- a/gdal.cmake ++++ b/gdal.cmake +@@ -277,14 +277,14 @@ endif () + + # Check that all symbols we need are present in our dependencies This is in particular useful to check that drivers + # built as plugins can access all symbols they need. +-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- include(CheckLinkerFlag) +- check_linker_flag(C "-Wl,--no-undefined" HAS_NO_UNDEFINED) +- if (HAS_NO_UNDEFINED AND (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-fsanitize") AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") +- string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--no-undefined") +- string(APPEND CMAKE_MODULE_LINKER_FLAGS " -Wl,--no-undefined") +- endif () +-endif () ++# if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") ++# include(CheckLinkerFlag) ++# check_linker_flag(C "-Wl,--no-undefined" HAS_NO_UNDEFINED) ++# if (HAS_NO_UNDEFINED AND (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-fsanitize") AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") ++# string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--no-undefined") ++# string(APPEND CMAKE_MODULE_LINKER_FLAGS " -Wl,--no-undefined") ++# endif () ++# endif () + + macro(set_alternate_linker linker) + if( NOT "${USE_ALTERNATE_LINKER}" STREQUAL "${USE_ALTERNATE_LINKER_OLD_CACHED}" ) From d0fede4b7a9c7893d2e1f1eb66619d1bddaca9fa Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:16:35 +0200 Subject: [PATCH 18/31] tweak paths --- G/GDAL/build_tarballs.jl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 9d7168a5a65..70e9ed59b88 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -21,7 +21,6 @@ sources = [ # Bash recipe for building across all platforms script = raw""" cd $WORKSPACE/srcdir/gdal -install_license LICENSE.TXT mkdir build && cd build @@ -32,7 +31,7 @@ if [[ "${target}" == *-freebsd* ]]; then # The flag `-lexecinfo` fixes "undefined reference to `backtrace'". export LDFLAGS="-lexecinfo -undefined" - atomic_patch -p1 ../patches/bsd-environ-undefined-fix.patch + atomic_patch -p1 ../../patches/bsd-environ-undefined-fix.patch fi if [[ "${target}" == x86_64-apple-darwin* ]]; then @@ -92,6 +91,8 @@ fi cmake .. ${CMAKE_FLAGS[@]} cmake --build . -j${nproc} cmake --build . -j${nproc} --target install + +install_license LICENSE.TXT """ # These are the platforms we will build for by default, unless further From c71d31183054400176db36b10150484bcd86a1a6 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:32:45 +0200 Subject: [PATCH 19/31] Fix ordering, etc. --- G/GDAL/build_tarballs.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 70e9ed59b88..445a0deae09 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -22,7 +22,7 @@ sources = [ script = raw""" cd $WORKSPACE/srcdir/gdal -mkdir build && cd build +install_license LICENSE.TXT if [[ "${target}" == *-freebsd* ]]; then # Our FreeBSD libc has `environ` as undefined symbol, so the linker will @@ -34,6 +34,8 @@ if [[ "${target}" == *-freebsd* ]]; then atomic_patch -p1 ../../patches/bsd-environ-undefined-fix.patch fi +mkdir build && cd build + if [[ "${target}" == x86_64-apple-darwin* ]]; then # Work around the issue # /opt/x86_64-apple-darwin14/x86_64-apple-darwin14/sys-root/usr/local/include/arrow/type.h:1745:36: error: 'get, std::vector>' is unavailable: introduced in macOS 10.14 @@ -91,8 +93,6 @@ fi cmake .. ${CMAKE_FLAGS[@]} cmake --build . -j${nproc} cmake --build . -j${nproc} --target install - -install_license LICENSE.TXT """ # These are the platforms we will build for by default, unless further From 57fe5858fbbd403da2955ec4401c510818ba02a6 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:38:18 +0200 Subject: [PATCH 20/31] Add back dependency bounds --- G/GDAL/build_tarballs.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 445a0deae09..06a93f99aa0 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -135,20 +135,20 @@ hdf5_platforms = expand_cxxstring_abis(hdf5_platforms) # Dependencies that must be installed before this package can be built dependencies = [ - Dependency("GEOS_jll"), - Dependency("PROJ_jll"), + Dependency("GEOS_jll"; compat="3.11.2"), + Dependency("PROJ_jll"; compat="900.100.0"), Dependency("Zlib_jll"), Dependency("SQLite_jll"), Dependency("LibPQ_jll"), Dependency("OpenJpeg_jll"), Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), - Dependency("Libtiff_jll"), - Dependency("libgeotiff_jll"), + Dependency("Libtiff_jll"; compat="4.4.0"), + Dependency("libgeotiff_jll"; compat="100.700.100"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package - Dependency("HDF5_jll"; platforms=hdf5_platforms), + Dependency("HDF5_jll"; compat="~1.12", platforms=hdf5_platforms), Dependency("Arrow_jll"; compat="10"), ] From 7472e8ee93e0d7eea3e6e6c77ddb622b28e12ed5 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:39:42 +0200 Subject: [PATCH 21/31] Fix bsd patch --- .../patches/bsd-environ-undefined-fix.patch | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/G/GDAL/bundled/patches/bsd-environ-undefined-fix.patch b/G/GDAL/bundled/patches/bsd-environ-undefined-fix.patch index 685c0a15990..a6a01a1cebd 100644 --- a/G/GDAL/bundled/patches/bsd-environ-undefined-fix.patch +++ b/G/GDAL/bundled/patches/bsd-environ-undefined-fix.patch @@ -1,27 +1,13 @@ diff --git a/gdal.cmake b/gdal.cmake -index e221f99b79..bfd00348f3 100644 +index e221f99b79..9c93be2cd8 100644 --- a/gdal.cmake +++ b/gdal.cmake -@@ -277,14 +277,14 @@ endif () - - # Check that all symbols we need are present in our dependencies This is in particular useful to check that drivers - # built as plugins can access all symbols they need. --if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -- include(CheckLinkerFlag) -- check_linker_flag(C "-Wl,--no-undefined" HAS_NO_UNDEFINED) +@@ -280,7 +280,7 @@ endif () + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + include(CheckLinkerFlag) + check_linker_flag(C "-Wl,--no-undefined" HAS_NO_UNDEFINED) - if (HAS_NO_UNDEFINED AND (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-fsanitize") AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") -- string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--no-undefined") -- string(APPEND CMAKE_MODULE_LINKER_FLAGS " -Wl,--no-undefined") -- endif () --endif () -+# if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -+# include(CheckLinkerFlag) -+# check_linker_flag(C "-Wl,--no-undefined" HAS_NO_UNDEFINED) -+# if (HAS_NO_UNDEFINED AND (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-fsanitize") AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") -+# string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--no-undefined") -+# string(APPEND CMAKE_MODULE_LINKER_FLAGS " -Wl,--no-undefined") -+# endif () -+# endif () - - macro(set_alternate_linker linker) - if( NOT "${USE_ALTERNATE_LINKER}" STREQUAL "${USE_ALTERNATE_LINKER_OLD_CACHED}" ) ++ if (HAS_NO_UNDEFINED AND (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-fsanitize") AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--no-undefined") + string(APPEND CMAKE_MODULE_LINKER_FLAGS " -Wl,--no-undefined") + endif () From 73dd2cf6879c9a416981504bf80095e6157b085d Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:40:36 +0200 Subject: [PATCH 22/31] Apply patch for all platforms --- G/GDAL/build_tarballs.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 06a93f99aa0..e0cd1277500 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -24,14 +24,14 @@ cd $WORKSPACE/srcdir/gdal install_license LICENSE.TXT +atomic_patch -p1 ../../patches/bsd-environ-undefined-fix.patch + if [[ "${target}" == *-freebsd* ]]; then # Our FreeBSD libc has `environ` as undefined symbol, so the linker will # complain if this symbol is used in the built library, even if this won't # be a problem at runtime. The flag `-undefined` allows having undefined symbols. # The flag `-lexecinfo` fixes "undefined reference to `backtrace'". export LDFLAGS="-lexecinfo -undefined" - - atomic_patch -p1 ../../patches/bsd-environ-undefined-fix.patch fi mkdir build && cd build From 1185d86d1232ec2338f9e5794144db59968a1ce9 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:44:02 +0200 Subject: [PATCH 23/31] Bump HDF5 --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index e0cd1277500..024f3a6dbb5 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -148,7 +148,7 @@ dependencies = [ Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; platforms=hdf5_platforms), # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package - Dependency("HDF5_jll"; compat="~1.12", platforms=hdf5_platforms), + Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), Dependency("Arrow_jll"; compat="10"), ] From a7b91883d3a92e1561e0f71838bc7f43f890b100 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:31:54 +0200 Subject: [PATCH 24/31] Update G/GDAL/build_tarballs.jl Co-authored-by: Martijn Visser --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 024f3a6dbb5..95ebe7c850a 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -143,7 +143,7 @@ dependencies = [ Dependency("OpenJpeg_jll"), Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), - Dependency("Libtiff_jll"; compat="4.4.0"), + Dependency("Libtiff_jll"; compat="4.5.1"), Dependency("libgeotiff_jll"; compat="100.700.100"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; platforms=hdf5_platforms), From 0b420d31b68f93db20819b64ff3c290cb65aa824 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:38:09 +0200 Subject: [PATCH 25/31] expand hdf5 platforms, bump gdal --- G/GDAL/build_tarballs.jl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 95ebe7c850a..c0e7c4a59ba 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -3,7 +3,7 @@ using BinaryBuilder, Pkg name = "GDAL" -upstream_version = v"3.7.1" +upstream_version = v"3.7.2" version_offset = v"0.0.0" version = VersionNumber(upstream_version.major * 100 + version_offset.major, upstream_version.minor * 100 + version_offset.minor, @@ -12,7 +12,7 @@ version = VersionNumber(upstream_version.major * 100 + version_offset.major, # Collection of sources required to build GDAL sources = [ GitSource("https://github.com/OSGeo/gdal.git", - "68da5257b139d4d80162cf83fdb8c6d26ead412f"), + "f74cd4144199fd7667e5c151a251cdbad1f44641"), ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz", "2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"), DirectorySource("./bundled") @@ -125,11 +125,15 @@ products = [ hdf5_platforms = [ Platform("x86_64", "linux"), - Platform("aarch64", "linux"; libc="glibc"), + Platform("aarch64", "linux"), + Platform("armv6l", "linux"), + Platform("armv7l", "linux"), + Platform("i686", "linux"), + Platform("powerpc64le", "linux"), Platform("x86_64", "macos"), + Platform("aarch64", "macos"), Platform("x86_64", "windows"), Platform("i686", "windows"), - Platform("aarch64", "macos"), ] hdf5_platforms = expand_cxxstring_abis(hdf5_platforms) @@ -147,7 +151,6 @@ dependencies = [ Dependency("libgeotiff_jll"; compat="100.700.100"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; platforms=hdf5_platforms), - # Updating to a newer HDF5 version is likely possible without problems but requires rebuilding this package Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), Dependency("Arrow_jll"; compat="10"), ] From 99e4614f0fae4549c1ab022f9bb78213cbe9a7dc Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:39:30 +0200 Subject: [PATCH 26/31] Update G/GDAL/build_tarballs.jl Co-authored-by: Martijn Visser --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index c0e7c4a59ba..6d7b998b725 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -140,7 +140,7 @@ hdf5_platforms = expand_cxxstring_abis(hdf5_platforms) # Dependencies that must be installed before this package can be built dependencies = [ Dependency("GEOS_jll"; compat="3.11.2"), - Dependency("PROJ_jll"; compat="900.100.0"), + Dependency("PROJ_jll"; compat="901.300.0"), Dependency("Zlib_jll"), Dependency("SQLite_jll"), Dependency("LibPQ_jll"), From 4866b99b88bedbbcd470b05f0ce3336b47469eac Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:43:45 +0200 Subject: [PATCH 27/31] Update G/GDAL/build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 6d7b998b725..0598311e5a8 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -24,7 +24,7 @@ cd $WORKSPACE/srcdir/gdal install_license LICENSE.TXT -atomic_patch -p1 ../../patches/bsd-environ-undefined-fix.patch +atomic_patch -p1 ../patches/bsd-environ-undefined-fix.patch if [[ "${target}" == *-freebsd* ]]; then # Our FreeBSD libc has `environ` as undefined symbol, so the linker will From 1065a7997839e826a36b1ca1723b306b809d3ed2 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:53:02 +0200 Subject: [PATCH 28/31] move license.txt import --- G/GDAL/build_tarballs.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 0598311e5a8..2db44f6ced6 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -22,8 +22,6 @@ sources = [ script = raw""" cd $WORKSPACE/srcdir/gdal -install_license LICENSE.TXT - atomic_patch -p1 ../patches/bsd-environ-undefined-fix.patch if [[ "${target}" == *-freebsd* ]]; then @@ -93,6 +91,8 @@ fi cmake .. ${CMAKE_FLAGS[@]} cmake --build . -j${nproc} cmake --build . -j${nproc} --target install + +install_license ../LICENSE.TXT """ # These are the platforms we will build for by default, unless further From c20bd64bea4fc66bfbc48f99a00b48d7665ee675 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:59:29 +0200 Subject: [PATCH 29/31] trigger build... --- G/GDAL/build_tarballs.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 2db44f6ced6..3f263cbda1c 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -32,8 +32,6 @@ if [[ "${target}" == *-freebsd* ]]; then export LDFLAGS="-lexecinfo -undefined" fi -mkdir build && cd build - if [[ "${target}" == x86_64-apple-darwin* ]]; then # Work around the issue # /opt/x86_64-apple-darwin14/x86_64-apple-darwin14/sys-root/usr/local/include/arrow/type.h:1745:36: error: 'get, std::vector>' is unavailable: introduced in macOS 10.14 @@ -49,6 +47,8 @@ if [[ "${target}" == x86_64-apple-darwin* ]]; then popd fi +mkdir build && cd build + CMAKE_FLAGS=(-DCMAKE_INSTALL_PREFIX=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_PREFIX_PATH=${prefix} From 07c93bf69eefe6894d5d49a8a354e599f817bccd Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:21:31 +0200 Subject: [PATCH 30/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 92095465c2c..4f19b999384 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -148,7 +148,7 @@ dependencies = [ Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), Dependency("Libtiff_jll"; compat="4.5.1"), - Dependency("libgeotiff_jll"; compat="100.700.100"), + Dependency("libgeotiff_jll"; compat="100.701.100"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; compat="400.902.208", platforms=hdf5_platforms), Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), From e980c5d3539506e1f29d394fb42a768ecdfde5c5 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Fri, 22 Sep 2023 15:25:11 +0200 Subject: [PATCH 31/31] Update build_tarballs.jl --- G/GDAL/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index 4f19b999384..602f414501e 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -147,7 +147,7 @@ dependencies = [ Dependency("OpenJpeg_jll"), Dependency("Expat_jll"; compat="2.2.10"), Dependency("Zstd_jll"), - Dependency("Libtiff_jll"; compat="4.5.1"), + Dependency("Libtiff_jll"; compat="~4.5.1"), Dependency("libgeotiff_jll"; compat="100.701.100"), Dependency("LibCURL_jll"; compat="7.73,8"), Dependency("NetCDF_jll"; compat="400.902.208", platforms=hdf5_platforms),