Add ability to pass vendored feature to openssl in libduckdb-sys (#321)

* Keep other feature configuration from openssl * Fix clippy warnings * Add ability to pass vendored feature to openssl in libduckdb-sys --------- Co-authored-by: Murali <[email protected]>
duckdb · Jun 6, 2024 · 3bd503c · 3bd503c
1 parent f5da417
commit 3bd503c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git 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
@@ -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 }

diff --git a/crates/libduckdb-sys/openssl/find_normal.rs b/crates/libduckdb-sys/openssl/find_normal.rs
@@ -141,7 +141,7 @@ openssl-sys = {}
 openssl-sys crate build failed: no supported version of OpenSSL found.
 
 Ways to fix it:
-- Use the `vendored` feature of openssl-sys crate to build OpenSSL from source.
+- Use the `openssl_vendored` feature of libduckdb-sys crate to build OpenSSL from source.
 - Use Homebrew to install the `openssl` package.
 
 ",

diff --git a/crates/libduckdb-sys/openssl/find_vendored.rs b/crates/libduckdb-sys/openssl/find_vendored.rs
@@ -1,9 +1,8 @@
-use openssl_src;
 use std::path::PathBuf;
 
 pub fn get_openssl(_target: &str) -> (Vec<PathBuf>, PathBuf) {
     let artifacts = openssl_src::Build::new().build();
-    println!("cargo:vendored=1");
+    println!("cargo:openssl_vendored=1");
     println!("cargo:root={}", artifacts.lib_dir().parent().unwrap().display());
 
     (

diff --git a/crates/libduckdb-sys/openssl/mod.rs b/crates/libduckdb-sys/openssl/mod.rs
@@ -22,7 +22,7 @@ extern crate autocfg;
 #[cfg(feature = "openssl_bindgen")]
 extern crate bindgen;
 extern crate cc;
-#[cfg(feature = "vendored")]
+#[cfg(feature = "openssl_vendored")]
 extern crate openssl_src;
 extern crate pkg_config;
 #[cfg(target_env = "msvc")]
@@ -37,7 +37,7 @@ use std::{
 mod cfgs;
 
 mod find_normal;
-#[cfg(feature = "vendored")]
+#[cfg(feature = "openssl_vendored")]
 mod find_vendored;
 #[cfg(feature = "openssl_bindgen")]
 mod run_bindgen;
@@ -69,7 +69,7 @@ fn env(name: &str) -> Option<OsString> {
 }
 
 fn find_openssl(target: &str) -> Result<(Vec<PathBuf>, PathBuf), ()> {
-    #[cfg(feature = "vendored")]
+    #[cfg(feature = "openssl_vendored")]
     {
         // vendor if the feature is present, unless
         // OPENSSL_NO_VENDOR exists and isn't `0`
@@ -183,7 +183,7 @@ fn postprocess(include_dirs: &[PathBuf]) -> Version {
         }
     }
     #[cfg(feature = "openssl_bindgen")]
-    run_bindgen::run(&include_dirs);
+    run_bindgen::run(include_dirs);
 
     version
 }