Merge pull request #464 from tursodatabase/rusqlite-build

rusqlite build
tursodatabase · Oct 17, 2023 · 0a556d6 · 0a556d6
2 parents cef416b + d64145c
commit 0a556d6
Show file tree

Hide file tree

Showing 18 changed files with 161 additions and 796,077 deletions.
diff --git a/vendored/rusqlite/Cargo.toml b/vendored/rusqlite/Cargo.toml
@@ -45,12 +45,6 @@ functions = []
 trace = []
 # sqlite3_db_release_memory: 3.7.10 (2012-01-16)
 release_memory = []
-bundled = ["libsqlite3-sys/bundled", "modern_sqlite"]
-bundled-sqlcipher = ["libsqlite3-sys/bundled-sqlcipher", "bundled"]
-bundled-libsql-experimental = ["libsqlite3-sys/bundled-libsql-experimental", "bundled", "libsql-experimental"]
-bundled-libsql-wasm-experimental = ["libsqlite3-sys/bundled-libsql-wasm-experimental", "bundled", "libsql-wasm-experimental"]
-bundled-sqlcipher-vendored-openssl = ["libsqlite3-sys/bundled-sqlcipher-vendored-openssl", "bundled-sqlcipher"]
-buildtime_bindgen = ["libsqlite3-sys/buildtime_bindgen"]
 limits = []
 hooks = []
 i128_blob = []
@@ -72,9 +66,8 @@ series = ["vtab"]
 # check for invalid query.
 extra_check = []
 # ]3.14.0, last]
-modern_sqlite = ["libsqlite3-sys/bundled_bindings"]
+modern_sqlite = []
 in_gecko = ["modern_sqlite", "libsqlite3-sys/in_gecko"]
-bundled-windows = ["libsqlite3-sys/bundled-windows"]
 # Build bundled sqlite with -fsanitize=address
 with-asan = ["libsqlite3-sys/with-asan"]
 column_decltype = []
@@ -112,8 +105,6 @@ modern-full = [
     "window",
 ]
 
-bundled-full = ["modern-full", "bundled"]
-
 [dependencies]
 time = { version = "0.3.0", features = ["formatting", "macros", "parsing"], optional = true }
 bitflags = "2.0"

diff --git a/vendored/rusqlite/libsqlite3-sys/Cargo.toml b/vendored/rusqlite/libsqlite3-sys/Cargo.toml
@@ -13,13 +13,6 @@ categories = ["external-ffi-bindings"]
 
 [features]
 default = ["min_sqlite_version_3_14_0"]
-bundled = ["cc", "bundled_bindings"]
-bundled-windows = ["cc", "bundled_bindings"]
-bundled-sqlcipher = ["bundled"]
-bundled-libsql-experimental = ["bundled", "libsql-experimental"]
-bundled-libsql-wasm-experimental = ["bundled-libsql-experimental", "libsql-wasm-experimental"]
-bundled-sqlcipher-vendored-openssl = ["bundled-sqlcipher", "openssl-sys/vendored"]
-buildtime_bindgen = ["bindgen", "pkg-config", "vcpkg"]
 sqlcipher = []
 libsql-experimental = []
 libsql-wasm-experimental = ["dep:libsql-wasmtime-bindings"]
@@ -30,9 +23,9 @@ bundled_bindings = []
 # sqlite3_unlock_notify >= 3.6.12
 unlock_notify = []
 # 3.13.0
-preupdate_hook = ["buildtime_bindgen"]
+preupdate_hook = []
 # 3.13.0
-session = ["preupdate_hook", "buildtime_bindgen"]
+session = ["preupdate_hook"]
 in_gecko = []
 with-asan = []
 wasm32-wasi-vfs = []
@@ -49,7 +42,7 @@ openssl-sys = { version = "0.9", optional = true }
 libsql-wasmtime-bindings = { version = "0.2.1", optional = true }
 
 [build-dependencies]
-bindgen = { version = "0.65", optional = true, default-features = false, features = ["runtime"] }
+bindgen = { version = "0.65", default-features = false, features = ["runtime"] }
 pkg-config = { version = "0.3.19", optional = true }
-cc = { version = "1.0", optional = true }
+cc = { version = "1.0" }
 vcpkg = { version = "0.2", optional = true }