forked from Deuxfleurs/garage
Allow linking against system-provided libsqlite
Unfortunately, rusqlite uses the opposite logic for enabling/disabling bundled libraries to others (libsodium-sys, zstd-sys). Cargo features are very limited and doesn't allow to enable feature A in a dependency iff feature B is disabled. Note, lmdb-rkv-sys doesn't need any special treatment because it automatically links against system liblmdb if found via pkgconf. Linux distros should build garage with `--no-default-features --features system-libs` to disable bundled-libs and enable system-libs.
This commit is contained in:
parent
a6e40b75ea
commit
7511ba5530
2 changed files with 10 additions and 1 deletions
|
@ -22,7 +22,7 @@ hexdump = "0.1"
|
||||||
tracing = "0.1.30"
|
tracing = "0.1.30"
|
||||||
|
|
||||||
heed = "0.11"
|
heed = "0.11"
|
||||||
rusqlite = { version = "0.27", features = ["bundled"] }
|
rusqlite = "0.27"
|
||||||
sled = "0.34"
|
sled = "0.34"
|
||||||
|
|
||||||
# cli deps
|
# cli deps
|
||||||
|
@ -33,4 +33,5 @@ pretty_env_logger = { version = "0.4", optional = true }
|
||||||
mktemp = "0.4"
|
mktemp = "0.4"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
bundled-libs = [ "rusqlite/bundled" ]
|
||||||
cli = ["clap", "pretty_env_logger"]
|
cli = ["clap", "pretty_env_logger"]
|
||||||
|
|
|
@ -74,6 +74,14 @@ base64 = "0.13"
|
||||||
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
default = [ "bundled-libs" ]
|
||||||
kubernetes-discovery = [ "garage_rpc/kubernetes-discovery" ]
|
kubernetes-discovery = [ "garage_rpc/kubernetes-discovery" ]
|
||||||
k2v = [ "garage_util/k2v", "garage_api/k2v" ]
|
k2v = [ "garage_util/k2v", "garage_api/k2v" ]
|
||||||
|
|
||||||
|
# NOTE: bundled-libs and system-libs should be treat as mutually exclusive;
|
||||||
|
# exactly one of them should be enabled.
|
||||||
|
|
||||||
|
# Use bundled libsqlite instead of linking against system-provided.
|
||||||
|
bundled-libs = [ "garage_db/bundled-libs" ]
|
||||||
|
# Link against system-provided libsodium and libzstd.
|
||||||
system-libs = [ "garage_block/system-libs", "garage_rpc/system-libs", "sodiumoxide/use-pkg-config" ]
|
system-libs = [ "garage_block/system-libs", "garage_rpc/system-libs", "sodiumoxide/use-pkg-config" ]
|
||||||
|
|
Loading…
Reference in a new issue