Skip to content

Move to zeromq-src 0.2 #339

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

Merged
merged 1 commit into from
Sep 13, 2022
Merged

Move to zeromq-src 0.2 #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions zmq-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ build = "build/main.rs"
links = "zmq"

[features]
# Build libzmq from source.
vendored = ['zeromq-src']
# Build libzmq from source with encryption support via libsodium.
vendored = ['zeromq-src', 'libsodium-sys-stable']

[dependencies]
libc = "0.2.15"
libsodium-sys-stable = { version = "1.0", optional = true }

[build-dependencies]
metadeps = "1"
zeromq-src = { version = "0.1.7", optional = true }
zeromq-src = { version = "0.2.0", optional = true }

[package.metadata.pkg-config]
libzmq = "4.1"
15 changes: 12 additions & 3 deletions zmq-sys/build/vendored.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ pub fn configure() {
println!("cargo:rerun-if-changed=build/main.rs");
println!("cargo:rerun-if-env-changed=PROFILE");

let wants_debug = env::var("PROFILE").unwrap() == "debug";
let lib_dir = env::var("DEP_SODIUM_LIB").expect("build metadata `DEP_SODIUM_LIB` required");
let include_dir =
env::var("DEP_SODIUM_INCLUDE").expect("build metadata `DEP_SODIUM_INCLUDE` required");

let artifacts = zeromq_src::Build::new().link_static(true).build_debug(wants_debug).build();
artifacts.print_cargo_metadata();
let location = zeromq_src::LibLocation::new(lib_dir, include_dir);

// Note that by default `libzmq` builds without `libsodium` by instead
// relying on `tweetnacl`. However since this `tweetnacl` [has never been
// audited nor is ready for production](https://github.com/zeromq/libzmq/issues/3006),
// we link against `libsodium` to enable `ZMQ_CURVE`.
zeromq_src::Build::new()
.with_libsodium(Some(location))
.build();
}