Commit eb0522fe authored by trinity-1686a's avatar trinity-1686a 💜
Browse files

fix segfault on static bin

see https://github.com/rusqlite/rusqlite/issues/914

sha256: 684ebc4b8c270fc63beba185f6c54ceeb98734f13aa7aeca9b64acb33432a21c
parent 54030285
......@@ -39,7 +39,6 @@ build-repro:
image: rust:1.54.0-alpine3.14
script:
- ./maint/reproducible_build.sh
- mv /arti/target/x86_64-unknown-linux-musl/release/arti ./arti-bin
artifacts:
paths:
- arti-bin
......
......@@ -1300,6 +1300,7 @@ version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d"
dependencies = [
"cc",
"pkg-config",
"vcpkg",
]
......
......@@ -14,7 +14,7 @@ repository="https://gitlab.torproject.org/tpo/core/arti.git/"
default = [ "tokio" ]
async-std = [ "tor-client/async-std", "tor-rtcompat/async-std", "async-ctrlc", "once_cell" ]
tokio = [ "tokio-crate", "tor-client/tokio", "tor-rtcompat/tokio" ]
vendored = [ "tor-rtcompat/vendored" ]
static = [ "tor-rtcompat/static", "tor-dirmgr/static" ]
[dependencies]
tor-client = { package="arti-tor-client", path = "../tor-client", version="0.0.0" }
......
......@@ -21,7 +21,9 @@ mkdir -p /sys/fs/cgroup/registry /usr/local/cargo/registry
ln -s /sys/fs/cgroup/registry /usr/local/cargo/registry/src
## add missing dependancies
apk add --no-cache musl-dev perl make sqlite-static sqlite-dev
apk add --no-cache musl-dev perl make
cargo build -p arti --target x86_64-unknown-linux-musl --release --features vendored
cargo build -p arti --target x86_64-unknown-linux-musl --release --features static
sha256sum target/x86_64-unknown-linux-musl/release/arti
mv /arti/target/x86_64-unknown-linux-musl/release/arti "$here"/arti-bin
......@@ -13,6 +13,7 @@ repository="https://gitlab.torproject.org/tpo/core/arti.git/"
[features]
default = [ "mmap" ]
mmap = [ "memmap2" ]
static = [ "rusqlite/bundled" ]
[dependencies]
retry-error = { path="../retry-error", version="0.0.0" }
......
......@@ -15,7 +15,7 @@ repository="https://gitlab.torproject.org/tpo/core/arti.git/"
default = [ ]
async-std = [ "async-std-crate", "async-io", "async-native-tls" , "async_executors/async_std" ]
tokio = [ "tokio-crate", "tokio-util", "tokio-native-tls", "async_executors/tokio_tp" ]
vendored = [ "native-tls/vendored" ]
static = [ "native-tls/vendored" ]
[dependencies]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment