Make sys package build more robust

Remove `lib` from name to follow conventions and add sys packages for
libz and lz4 to make sure they link properly.

Author: thijsc

.gitignore

@@ -1,2 +1,3 @@
 target
 src/*.bk
+*.lock

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "librdkafka-sys/librdkafka"]
-	path = librdkafka-sys/librdkafka
+[submodule "librdkafka"]
+	path = rdkafka-sys/librdkafka
 	url = https://github.com/edenhill/librdkafka.git

Cargo.lock

@@ -9,7 +9,7 @@ description = "Rust wrapper for librdkafka"
 keywords = ["kafka", "rdkafka"]
 
 [dependencies]
-librdkafka-sys = { path = "librdkafka-sys", version = "0.9.2-0" }
+rdkafka-sys = { path = "rdkafka-sys", version = "0.9.2-0" }
 clap = "2.18.0"
 env_logger = "^0.3.0"
 errno = "^0.1.8"
@@ -18,8 +18,7 @@ libc = "^0.2.0"
 log = "^0.3.0"
 
 [features]
-default = ["zlib"]
+default = []
 
-zlib = ["librdkafka-sys/zlib"]
-ssl = ["librdkafka-sys/ssl"]
-sasl = ["librdkafka-sys/sasl", "ssl"]
+ssl = ["rdkafka-sys/ssl"]
+sasl = ["rdkafka-sys/sasl", "ssl"]

Cargo.toml

@@ -42,7 +42,7 @@ executable. To compile librdkafka you'll need:
 * the GNU toolchain
 * GNU `make`
 * `pthreads`
-* `zlib`: optional, included by default (feature: `zlib`).
+* `zlib`
 * `libssl-dev`: optional, *not* included by default (feature: `ssl`).
 * `libsasl2-dev`: optional, *not* included by default (feature: `sasl`).
 

README.md

@@ -1,5 +1,5 @@
 [package]
-name = "librdkafka-sys"
+name = "rdkafka-sys"
 version = "0.9.2-0"
 authors = ["Federico Giraud <[email protected]>"]
 build = "build.rs"
@@ -10,17 +10,19 @@ description = "Native bindings to the librdkafka library"
 keywords = ["kafka", "rdkafka"]
 
 [dependencies]
+lz4-sys = { git = "https://github.com/thijsc/lz4-rs.git" }
+libz-sys = ">= 1.0.7"
+openssl-sys = "> 0.7.0"
 
 [build-dependencies]
-num_cpus = "0.2"
+num_cpus = "~ 0.2.0"
 
 [lib]
-name = "librdkafka_sys"
+name = "rdkafka_sys"
 path = "src/lib.rs"
 
 [features]
-default = ["zlib"]
+default = []
 
-zlib = []
 ssl = []
 sasl = ["ssl"]

librdkafka-sys/Cargo.lock

@@ -1,6 +1,6 @@
 extern crate num_cpus;
 
-// use std::path::Path;
+use std::path::Path;
 use std::process::Command;
 use std::io::Write;
 use std::env;
@@ -24,25 +24,27 @@ fn run_command_or_fail(dir: &str, cmd: &str, args: &[&str]) {
 }
 
 fn main() {
-    // if !Path::new("librdkafka/.git").exists() {
-    //     println!("Setting up submodules");
-    //     run_command_or_fail(".", "git", &["submodule", "update", "--init"]);
-    // }
-
-    let feature_sasl = env::var("CARGO_FEATURE_SASL").is_ok();
-    let feature_ssl = env::var("CARGO_FEATURE_SSL").is_ok();
-    let feature_zlib = env::var("CARGO_FEATURE_ZLIB").is_ok();
+    if !Path::new("librdkafka/LICENCE").exists() {
+        println!("Setting up submodules");
+        run_command_or_fail("../", "git", &["submodule", "update", "--init"]);
+    }
 
     let mut configure_flags = Vec::new();
 
-    if !feature_sasl {
+    if env::var("CARGO_FEATURE_SASL").is_ok() {
+        configure_flags.push("--enable-sasl");
+    } else {
         configure_flags.push("--disable-sasl");
     }
 
-    if !feature_ssl {
+    if env::var("CARGO_FEATURE_SSL").is_ok() {
+        configure_flags.push("--enable-ssl");
+    } else {
         configure_flags.push("--disable-ssl");
     }
 
+    configure_flags.push("--enable-static");
+
     println!("Configuring librdkafka");
     run_command_or_fail("librdkafka", "./configure", configure_flags.as_slice());
 
@@ -51,17 +53,4 @@ fn main() {
 
     println!("cargo:rustc-link-search=native={}/librdkafka/src", env::current_dir().expect("Can't find current dir").display());
     println!("cargo:rustc-link-lib=static=rdkafka");
-
-    if feature_ssl {
-        println!("cargo:rustc-link-lib=dylib=crypto");
-        println!("cargo:rustc-link-lib=dylib=ssl");
-    }
-
-    if feature_zlib {
-        println!("cargo:rustc-link-lib=dylib=z");
-    }
-
-    // println!("cargo:rustc-link-search=/usr/local/opt/openssl/lib");
-    // println!("cargo:libdir=/usr/local/opt/openssl/lib");
-    // println!("cargo:include=/usr/local/opt/openssl/include");
 }

librdkafka-sys/librdkafka

@@ -0,0 +1,9 @@
+#[cfg(feature = "ssl")]
+extern crate openssl_sys;
+
+extern crate lz4_sys;
+extern crate libz_sys;
+
+pub mod bindings;
+
+pub use bindings::*;