From abac35c872adb55ff9b1ef8ffe134ffe61d5e445 Mon Sep 17 00:00:00 2001 From: link2xt Date: Sat, 1 May 2021 06:45:28 +0300 Subject: [PATCH] Make it possible to disable bundled SQLite Also disable it in CMakeLists.txt which is used to install libdeltachat system-wide. --- CMakeLists.txt | 2 +- Cargo.toml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6648c93b9..f66b37f7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ add_custom_command( "target/release/libdeltachat.a" "target/release/libdeltachat.so" "target/release/pkgconfig/deltachat.pc" - COMMAND PREFIX=${CMAKE_INSTALL_PREFIX} ${CARGO} build --package deltachat_ffi --release + COMMAND PREFIX=${CMAKE_INSTALL_PREFIX} ${CARGO} build --package deltachat_ffi --release --no-default-features WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/Cargo.toml b/Cargo.toml index b2cc69c47..f7e7dd17b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ r2d2 = "0.8.9" r2d2_sqlite = "0.18.0" rand = "0.7.0" regex = "1.1.6" -rusqlite = { version = "0.25", features = ["bundled"] } +rusqlite = "0.25" rust-hsluv = "0.1.4" rustyline = { version = "4.1.0", optional = true } sanitize-filename = "0.3.0" @@ -115,8 +115,9 @@ name = "search_msgs" harness = false [features] -default = [] +default = ["bundled-sqlite"] internals = [] repl = ["internals", "rustyline", "log", "pretty_env_logger", "ansi_term", "dirs"] vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored"] nightly = ["pgp/nightly"] +bundled-sqlite = ["rusqlite/bundled"]