Skip to content

Commit

Permalink
[GDAL] build version 3.5.0 (#4979)
Browse files Browse the repository at this point in the history
* set GDAL version to 3.5.0

* require libgeotiff_jll 1.7.1

Since that one is built against PROJ 9.

* build using GCC v7 to avoid internal compiler error

For `aarch64-linux-gnu-cxx03`

```
[09:51:57] mitab_mapindexblock.cpp: In member function ‘int TABMAPIndexBlock::ChooseSubEntryForInsert(GInt32, GInt32, GInt32, GInt32)’:
[09:51:57] mitab_mapindexblock.cpp:547:1: internal compiler error: Segmentation fault
[09:51:57]  }
[09:51:57]  ^
[09:51:58] 0xaa37e6 crash_signal
[09:51:58]      /workspace/srcdir/gcc-6.1.0/gcc/toplev.c:333
[09:51:58] 0x7f96e2d771de ???
[09:51:58]      /workspace/srcdir/musl-1.2.2/src/signal/x86_64/restore.s:1
[09:51:58] Please submit a full bug report,
[09:51:58] with preprocessed source if appropriate.
[09:51:58] Please include the complete backtrace with any bug report.
[09:51:58] See <http://gcc.gnu.org/bugs.html> for instructions.
```
  • Loading branch information
visr authored Jun 2, 2022
1 parent 695344c commit 7289473
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions G/GDAL/build_tarballs.jl
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")

0 comments on commit 7289473

Please sign in to comment.