aports/testing/vector/use-system-libs.patch
2024-06-29 13:34:05 +00:00

77 lines
3.6 KiB
Diff

diff --git a/Cargo.lock b/Cargo.lock
index d5b347b..81f95c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3407,6 +3407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
dependencies = [
"crc32fast",
+ "libz-ng-sys",
"miniz_oxide",
]
@@ -4890,6 +4891,16 @@ version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+[[package]]
+name = "libz-ng-sys"
+version = "1.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63"
+dependencies = [
+ "cmake",
+ "libc",
+]
+
[[package]]
name = "libz-sys"
version = "1.1.12"
@@ -4897,6 +4908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
dependencies = [
"cc",
+ "cmake",
"libc",
"pkg-config",
"vcpkg",
@@ -9950,6 +9962,7 @@ dependencies = [
"kube",
"lapin",
"libc",
+ "libz-sys",
"listenfd",
"logfmt",
"loki-logproto",
diff --git a/Cargo.toml b/Cargo.toml
index 21d8aa1..069db37 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -253,7 +253,7 @@ dyn-clone = { version = "1.0.16", default-features = false }
encoding_rs = { version = "0.8.33", default-features = false, features = ["serde"] }
enum_dispatch = { version = "0.3.12", default-features = false }
exitcode = { version = "1.1.2", default-features = false }
-flate2 = { version = "1.0.30", default-features = false, features = ["default"] }
+flate2 = { version = "1.0.30", default-features = false, features = ["zlib-ng"] }
futures-util = { version = "0.3.29", default-features = false }
glob = { version = "0.3.1", default-features = false }
governor = { version = "0.6.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
@@ -318,7 +318,8 @@ typetag = { version = "0.2.13", default-features = false }
url = { version = "2.5.1", default-features = false, features = ["serde"] }
uuid = { version = "1", default-features = false, features = ["serde", "v4"] }
warp = { version = "0.3.7", default-features = false }
-zstd = { version = "0.13.0", default-features = false }
+zstd = { version = "0.13.0", default-features = false, features = ["pkg-config"] }
+libz-sys = { version = "1.1.12", default-features = false, features = ["zlib-ng"] }
arr_macro = { version = "0.2.1" }
# depending on fork for bumped nix dependency
@@ -385,7 +386,7 @@ default-cmake = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build
# Default features for *-pc-windows-msvc
# TODO: Enable SASL https://github.com/vectordotdev/vector/pull/3081#issuecomment-659298042
default-msvc = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "transforms", "secrets"]
-default-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
+default-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/dynamic-linking", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi", "secrets"]
default-no-api-client = ["api", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
default-no-vrl-cli = ["api", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"]
tokio-console = ["dep:console-subscriber", "tokio/tracing"]