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.

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

[libzenohc] Update to 1.0.0 #9693

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
17 changes: 10 additions & 7 deletions L/libzenohc/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,32 @@
using BinaryBuilder, Pkg

name = "libzenohc"
version = v"0.10.1"
version = v"1.0.0"

# Collection of sources required to complete build
sources = [
GitSource("https://github.com/eclipse-zenoh/zenoh-c.git", "a0bacbb65b11e1e5ecedb3b3888beba78bf227cd")
GitSource("https://github.com/eclipse-zenoh/zenoh-c.git", "bca57bb6e5a55421cc6ef20ddae5fd3cbb58c30c")
]

# Bash recipe for building across all platforms
script = raw"""
cd $WORKSPACE/srcdir
n0wis marked this conversation as resolved.
Show resolved Hide resolved
cd $WORKSPACE/srcdir/zenoh-c
cmake -B build -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DZENOHC_CARGO_CHANNEL=$RUSTUP_TOOLCHAIN -DZENOHC_CUSTOM_TARGET=$CARGO_BUILD_TARGET
cmake -B build -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DZENOHC_CUSTOM_TARGET=$CARGO_BUILD_TARGET
cmake --build build --parallel ${nproc}
cmake --install build
cmake --build build --target install
"""

# These are the platforms we will build for by default, unless further
# platforms are passed in on the command line
platforms = [
Platform("aarch64", "macos"; ),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changed the order of the platforms, which (a) makes review harder than necessary and (b) breaks git blame.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback, what's the preferred order / sorting? Unfortunately I couldn't get it to build on FreeBSD anymore. I tried all platforms and powerpc64le now seems to work.

Platform("powerpc64le", "linux"; libc = "glibc"),
Platform("x86_64", "linux"; libc = "glibc"),
Platform("aarch64", "linux"; libc = "glibc"),
Platform("aarch64", "linux"; libc = "musl"),
Platform("x86_64", "macos"; ),
Platform("aarch64", "macos"; ),
Platform("x86_64", "freebsd"; )
Platform("x86_64", "linux"; libc = "musl"),
Platform("aarch64", "linux"; libc = "glibc")
]


Expand Down