Skip to content

Commit

Permalink
PROJ: New version 9.4.0 (#8746)
Browse files Browse the repository at this point in the history
* PROJ: New version 9.4.0

* PROJ: Use newer GCC version

* PROJ: Correct case of cmake variable
  • Loading branch information
eschnett authored and amontoison committed Jun 22, 2024
1 parent 7dc09cf commit 199603e
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions P/PROJ/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using BinaryBuilder, Pkg

name = "PROJ"
upstream_version = v"9.3.0"
upstream_version = v"9.4.0"
version_offset = v"1.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 complete build
sources = [
ArchiveSource("https://download.osgeo.org/proj/proj-$upstream_version.tar.gz",
"91a3695a004ea28db0448a34460bed4cc3b130e5c7d74339ec999efdab0e547d")
"3643b19b1622fe6b2e3113bdb623969f5117984b39f173b4e3fb19a8833bd216")
]

# Bash recipe for building across all platforms
Expand All @@ -22,11 +22,11 @@ cd $WORKSPACE/srcdir/proj-*
EXE_SQLITE3=${host_bindir}/sqlite3
if [[ ${target} == *mingw* ]]; then
SQLITE3_LIBRARY=${libdir}/libsqlite3-0.dll
SQLite3_LIBRARY=${libdir}/libsqlite3-0.dll
CURL_LIBRARY=${libdir}/libcurl-4.dll
TIFF_LIBRARY_RELEASE=${libdir}/libtiff-6.dll
else
SQLITE3_LIBRARY=${libdir}/libsqlite3.${dlext}
SQLite3_LIBRARY=${libdir}/libsqlite3.${dlext}
CURL_LIBRARY=${libdir}/libcurl.${dlext}
TIFF_LIBRARY_RELEASE=${libdir}/libtiff.${dlext}
fi
Expand All @@ -45,11 +45,11 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=OFF \
-DEXE_SQLITE3=$EXE_SQLITE3 \
-DSQLITE3_INCLUDE_DIR=${includedir} \
-DSQLITE3_LIBRARY=$SQLITE3_LIBRARY \
-DEXE_SQLITE3=${EXE_SQLITE3} \
-DSQLite3_INCLUDE_DIR=${includedir} \
-DSQLite3_LIBRARY=${SQLite3_LIBRARY} \
-DCURL_INCLUDE_DIR=${includedir} \
-DCURL_LIBRARY=$CURL_LIBRARY \
-DCURL_LIBRARY=${CURL_LIBRARY} \
-DTIFF_INCLUDE_DIR=${includedir} \
-DTIFF_LIBRARY_RELEASE=$TIFF_LIBRARY_RELEASE \
..
Expand Down Expand Up @@ -99,6 +99,7 @@ dependencies = [
]

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

# Build trigger: 1

0 comments on commit 199603e

Please sign in to comment.