From 28afabbd498b575f776840ecdf5b8ffbd8b9c42a Mon Sep 17 00:00:00 2001 From: Murali Date: Tue, 4 Jun 2024 19:57:05 +0200 Subject: [PATCH] Add ability to pass vendored feature to openssl in libduckdb-sys --- crates/duckdb/Cargo.toml | 3 +++ crates/libduckdb-sys/Cargo.toml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/crates/duckdb/Cargo.toml b/crates/duckdb/Cargo.toml index 5e45b701..6a26438c 100644 --- a/crates/duckdb/Cargo.toml +++ b/crates/duckdb/Cargo.toml @@ -23,6 +23,9 @@ bundled = ["libduckdb-sys/bundled"] httpfs = ["libduckdb-sys/httpfs", "bundled"] json = ["libduckdb-sys/json", "bundled"] parquet = ["libduckdb-sys/parquet", "bundled"] +openssl_vendored = ["libduckdb-sys/openssl_vendored", "bundled"] +unstable_boringssl = ["libduckdb-sys/unstable_boringssl", "bundled"] +openssl_bindgen = ["libduckdb-sys/openssl_bindgen", "bundled"] vtab = [] vtab-loadable = ["vtab", "duckdb-loadable-macros"] vtab-excel = ["vtab", "calamine"] diff --git a/crates/libduckdb-sys/Cargo.toml b/crates/libduckdb-sys/Cargo.toml index 207bdf56..ab4e89ce 100644 --- a/crates/libduckdb-sys/Cargo.toml +++ b/crates/libduckdb-sys/Cargo.toml @@ -25,12 +25,17 @@ json = ["bundled"] parquet = ["bundled"] extensions-full = ["httpfs", "json", "parquet"] +openssl_vendored = ["bundled", "openssl-src"] +openssl_bindgen = ["bundled", "bindgen", "pkg-config", "vcpkg"] +unstable_boringssl = ["bundled"] + [dependencies] [build-dependencies] autocfg = { workspace = true } bindgen = { workspace = true, features = ["runtime"], optional = true } flate2 = { workspace = true } +openssl-src = { version = "300.3.0", optional = true, features = ["legacy"] } pkg-config = { workspace = true, optional = true } cc = { workspace = true, features = ["parallel"], optional = true } vcpkg = { workspace = true, optional = true }