Merge pull request #603 from fede1024/davidblewett/librdkafka-v2.2.0

Update to librdkafka v2.2.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rdkafka"
-version = "0.33.2"
+version = "0.34.0"
 authors = ["Federico Giraud <giraud.federico@gmail.com>"]
 repository = "https://github.com/fede1024/rust-rdkafka"
 readme = "README.md"
@@ -15,7 +15,7 @@ exclude = ["Cargo.lock"]
 members = ["rdkafka-sys"]
 
 [dependencies]
-rdkafka-sys = { path = "rdkafka-sys", version = "4.5.0", default-features = false }
+rdkafka-sys = { path = "rdkafka-sys", version = "4.6.0", default-features = false }
 futures-channel = "0.3.0"
 futures-executor = { version = "0.3.0", optional = true }
 futures-util = { version = "0.3.0", default-features = false }

rdkafka-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rdkafka-sys"
-version = "4.5.0+1.9.2"
+version = "4.6.0+2.2.0"
 authors = ["Federico Giraud <giraud.federico@gmail.com>"]
 build = "build.rs"
 links = "rdkafka"
@@ -75,7 +75,7 @@ curl = ["curl-sys"]
 
 # Link against the version of curl bundled with the curl-sys crate, rather than
 # the system's version.
-curl-static = ["curl", "curl-sys/static-curl"]
+curl-static = ["curl-sys/static-curl"]
 
 # Enable support for zstd compression.
 zstd = ["zstd-sys"]

rdkafka-sys/build.rs

@@ -1,6 +1,8 @@
 use std::borrow::Borrow;
 use std::env;
 use std::ffi::OsStr;
+#[cfg(feature = "cmake-build")]
+use std::fs;
 use std::path::{Path, PathBuf};
 use std::process::{self, Command};
 
@@ -234,6 +236,14 @@ fn build_librdkafka() {
             config.cxxflag("-DCURL_STATICLIB");
             config.cflag(format!("-I{}/include", curl_root));
             config.cxxflag(format!("-I{}/include", curl_root));
+            config.cflag(format!("-L{}/lib", curl_root));
+            config.cxxflag(format!("-L{}/lib", curl_root));
+            //FIXME: Upstream should be copying this in their build.rs
+            fs::copy(
+                format!("{}/build/libcurl.a", curl_root),
+                format!("{}/lib/libcurl.a", curl_root),
+            )
+            .unwrap();
         }
     } else {
         config.define("WITH_CURL", "0");

rdkafka-sys/changelog.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Upgrade to librdkafka v2.2.0.
+
 ## v4.5.0+1.9.2 (2023-06-09)
 
 * Add support for the cluster mock API.