Skip to content

Commit

Permalink
[osmium] Bump to 1.17.0 (#10294)
Browse files Browse the repository at this point in the history
* [osmium] Bump to 1.17.0

* add nlohmann json

* drop comma

* Update build_tarballs.jl

* try boost 1.79

* Bump boost to riscv supported version

* try more recent gcc

* use correct gcc version for new boost

* Update build_tarballs.jl

* Update build_tarballs.jl
  • Loading branch information
jeremiahpslewis authored Feb 1, 2025
1 parent 981db0d commit 51cdfa0
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions O/osmium/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
using BinaryBuilder, Pkg

name = "osmium"
version = v"1.16.0"
version = v"1.17.0"

# Collection of sources required to complete build
sources = [
GitSource("https://github.com/osmcode/osmium-tool.git", "583db02ac9193dfb5217f93c823a4975405338ac"),
GitSource("https://github.com/osmcode/osmium-tool.git", "02b70f2c0df142f09ca24ffa633b6d3d1ec1e3eb"),
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz",
"2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"),
]
Expand All @@ -31,6 +31,8 @@ mkdir build && cd build
cmake .. \
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \
-DNLOHMANN_INCLUDE_DIR=${includedir} \
-DBoost_INCLUDE_DIR=${includedir} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17
Expand All @@ -55,12 +57,13 @@ products = [
dependencies = [
BuildDependency(PackageSpec(name="libosmium_jll", uuid="7f0a2ee1-9b43-5740-ae82-b54233cf7071"))
BuildDependency(PackageSpec(name="protozero_jll", uuid="e2028600-4f28-5e5c-ab86-957950af6e0a"))
Dependency(PackageSpec(name="boost_jll", uuid="28df3c45-c428-5900-9ff8-a3135698ca75"); compat="=1.76.0")
Dependency(PackageSpec(name="Bzip2_jll", uuid="6e34b625-4abd-537c-b88f-471c36dfa7a0"); compat="1.0.8")
BuildDependency("nlohmann_json_jll")
Dependency(PackageSpec(name="boost_jll", uuid="28df3c45-c428-5900-9ff8-a3135698ca75"); compat="=1.87.0")
Dependency(PackageSpec(name="Bzip2_jll", uuid="6e34b625-4abd-537c-b88f-471c36dfa7a0"); compat="1.0.9")
Dependency(PackageSpec(name="Zlib_jll", uuid="83775a58-1f1d-513f-b197-d71354ab007a"))
Dependency(PackageSpec(name="Lz4_jll", uuid="5ced341a-0733-55b8-9ab6-a4889d929147"))
Dependency(PackageSpec(name="Expat_jll", uuid="2e619515-83b5-522b-bb60-26c02a35a201"); compat="2.2.10")
Dependency(PackageSpec(name="Expat_jll", uuid="2e619515-83b5-522b-bb60-26c02a35a201"); compat="2.6.5")
]

# 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"7")
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6", preferred_gcc_version = v"11.1")

0 comments on commit 51cdfa0

Please sign in to comment.