Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GDAL] build version 3.5.0 #4979

Merged
merged 3 commits into from
Jun 2, 2022
Merged

[GDAL] build version 3.5.0 #4979

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c072c2
set GDAL version to 3.5.0
visr Jun 1, 2022
3c0d9a6
require libgeotiff_jll 1.7.1
visr Jun 2, 2022
25b120c
build using GCC v7 to avoid internal compiler error
visr Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions G/GDAL/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using BinaryBuilder, Pkg

name = "GDAL"
upstream_version = v"3.4.1"
upstream_version = v"3.5.0"
version_offset = v"0.0.0"
version = VersionNumber(upstream_version.major * 100 + version_offset.major,
upstream_version.minor * 100 + version_offset.minor,
Expand All @@ -12,7 +12,7 @@ version = VersionNumber(upstream_version.major * 100 + version_offset.major,
# Collection of sources required to build GDAL
sources = [
ArchiveSource("https://github.com/OSGeo/gdal/releases/download/v$upstream_version/gdal-$upstream_version.tar.gz",
"e360387bc25ec24940f46afbeada48002d72c74aaf9eccf2a40e8d74e711a2e4"),
"3affc513b8aa5a76b996eca55f45cb3e32acacf4a262ce4f686d4c8bba7ced40"),
DirectorySource("./bundled"),
]

Expand All @@ -25,7 +25,7 @@ if [[ ${target} == *mingw* ]]; then
# Apply patch to customise PROJ library
atomic_patch -p1 "$WORKSPACE/srcdir/patches/configure_ac_proj_libs.patch"
autoreconf -vi
export PROJ_LIBS="proj_8_2"
export PROJ_LIBS="proj_9_0"
elif [[ "${target}" == *-linux-* ]]; then
# Hint to find libstdc++, required to link against C++ libs when using C compiler
if [[ "${nbits}" == 32 ]]; then
Expand Down Expand Up @@ -114,16 +114,17 @@ products = [
# Dependencies that must be installed before this package can be built
dependencies = [
Dependency("GEOS_jll"; compat="~3.10"),
Dependency("PROJ_jll"; compat="~800.200"),
Dependency("PROJ_jll"; compat="~900.0"),
Dependency("Zlib_jll"),
Dependency("SQLite_jll"),
Dependency("OpenJpeg_jll"),
Dependency("Expat_jll"; compat="2.2.10"),
Dependency("Zstd_jll"),
Dependency("Libtiff_jll"; compat="4.3"),
Dependency("libgeotiff_jll"; compat="1.7"),
Dependency("libgeotiff_jll"; compat="1.7.1"),
Dependency("LibCURL_jll"),
]

# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6", preferred_gcc_version=v"6")
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
julia_compat="1.6", preferred_gcc_version=v"7")