[GDAL] Bump to v3.7.1 #7050
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,27 +3,26 @@ | |
| using BinaryBuilder, Pkg | ||
|
|
||
| name = "GDAL" | ||
| 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, | ||
| upstream_version.patch * 100 + version_offset.patch) | ||
|
|
||
| # Collection of sources required to build GDAL | ||
| sources = [ | ||
| GitSource("https://github.com/OSGeo/gdal.git", | ||
jeremiahpslewis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "f74cd4144199fd7667e5c151a251cdbad1f44641"), | ||
| 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 | ||
| script = raw""" | ||
| cd $WORKSPACE/srcdir/gdal | ||
|
|
||
| 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 | ||
|
|
@@ -48,28 +47,30 @@ 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} | ||
| -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 | ||
|
|
@@ -90,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 | ||
|
|
@@ -122,30 +125,33 @@ products = [ | |
|
|
||
| hdf5_platforms = [ | ||
| Platform("x86_64", "linux"), | ||
| 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"), | ||
| ] | ||
| 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"), | ||
jeremiahpslewis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Dependency("PROJ_jll"; compat="901.300.0"), | ||
|
There was a problem hiding this comment. PROJ_jll above had a There was a problem hiding this comment. Yeah I think this is fine. Since PROJ_jll has the 100x version_offset, I figured in #7366 it's easier to tag it as breaking using that, rather than forcing all dependencies to use |
||
| 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.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), | ||
| Dependency("HDF5_jll"; compat="~1.14", platforms=hdf5_platforms), | ||
jeremiahpslewis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Dependency("Arrow_jll"; compat="10"), | ||
| ] | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/gdal.cmake b/gdal.cmake | ||
| index e221f99b79..9c93be2cd8 100644 | ||
| --- a/gdal.cmake | ||
| +++ b/gdal.cmake | ||
| @@ -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") | ||
jeremiahpslewis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| + 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 () | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry I missed this in review, but this version offset should not have been set back to 0, since now the major version is v300, while the previous one was v301. Should we yank v300.700.200 from the registry and create a new v301 build?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably good, yeah