Skip to content
Snippets Groups Projects
Commit cbb2643b authored by Gilles Filippini's avatar Gilles Filippini Committed by Cédric Moreau
Browse files

build: enable gva for all architectures

parent ff5a4993
No related branches found
No related tags found
1 merge request!1417build: enable gva for all architectures
...@@ -9,8 +9,3 @@ uc = "update -p duniter-core" ...@@ -9,8 +9,3 @@ uc = "update -p duniter-core"
ug = "update -p duniter-gva" ug = "update -p duniter-gva"
ugc = "update -p duniter-gva-conf" ugc = "update -p duniter-gva-conf"
xtask = "run --package xtask --" xtask = "run --package xtask --"
# ARM x64 specific, otherwise crash (because of rustc bug)
# see: https://github.com/rust-lang/cargo/issues/6489
[target.'cfg(all(target_arch = "aarch64"))']
rustflags = ["-Ccodegen-units=1"]
...@@ -19,6 +19,7 @@ ctrlc = "3.1.6" ...@@ -19,6 +19,7 @@ ctrlc = "3.1.6"
daemonize-me = "0.3.1" daemonize-me = "0.3.1"
dirs = "3.0.1" dirs = "3.0.1"
duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer"] } duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer"] }
duniter-gva-conf = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" }
log = "0.4.11" log = "0.4.11"
logwatcher = "0.1.1" logwatcher = "0.1.1"
nix = "0.17.0" nix = "0.17.0"
...@@ -26,9 +27,6 @@ read_input = "0.8.4" ...@@ -26,9 +27,6 @@ read_input = "0.8.4"
serde_json = "1.0.53" serde_json = "1.0.53"
structopt = "0.3.18" structopt = "0.3.18"
[target.'cfg(target_arch = "x86_64")'.dependencies]
duniter-gva-conf = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" }
[dev-dependencies] [dev-dependencies]
rusty-hook = "0.11.2" rusty-hook = "0.11.2"
......
...@@ -9,14 +9,12 @@ edition = "2018" ...@@ -9,14 +9,12 @@ edition = "2018"
anyhow = "1.0.34" anyhow = "1.0.34"
cfg-if = "1.0.0" cfg-if = "1.0.0"
duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer"] } duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer"] }
duniter-gva = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" }
fast-threadpool = "0.2.3" fast-threadpool = "0.2.3"
flume = "0.10.0" flume = "0.10.0"
log = "0.4.11" log = "0.4.11"
paste = "1.0.2" paste = "1.0.2"
resiter = "0.4.0" resiter = "0.4.0"
[target.'cfg(target_arch = "x86_64")'.dependencies]
duniter-gva = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" }
[dev-dependencies] [dev-dependencies]
duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer", "mem"] } duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer", "mem"] }
...@@ -30,7 +30,6 @@ use duniter_core::dbs::databases::{bc_v2::BcV2DbReadable, network_v1::NetworkV1D ...@@ -30,7 +30,6 @@ use duniter_core::dbs::databases::{bc_v2::BcV2DbReadable, network_v1::NetworkV1D
pub use duniter_core::dbs::{ pub use duniter_core::dbs::{
kv_typed::prelude::KvResult, smallvec, DunpHeadDbV1, DunpNodeIdV1Db, PeerCardDbV1, kv_typed::prelude::KvResult, smallvec, DunpHeadDbV1, DunpNodeIdV1Db, PeerCardDbV1,
}; };
#[cfg(target_arch = "x86_64")]
pub use duniter_gva::GvaModule; pub use duniter_gva::GvaModule;
use anyhow::Context; use anyhow::Context;
...@@ -60,14 +59,8 @@ use std::{ ...@@ -60,14 +59,8 @@ use std::{
use duniter_core::conf as duniter_conf; use duniter_core::conf as duniter_conf;
use duniter_core::global as duniter_global; use duniter_core::global as duniter_global;
use duniter_core::mempools as duniter_mempools; use duniter_core::mempools as duniter_mempools;
cfg_if::cfg_if! { use duniter_core::module::DuniterModule;
if #[cfg(target_arch = "x86_64")] { plug_duniter_modules!([GvaModule], TxsHistoryForBma);
use duniter_core::module::DuniterModule;
plug_duniter_modules!([GvaModule], TxsHistoryForBma);
} else {
plug_duniter_modules!([], TxsHistoryForBma);
}
}
pub struct DuniterServer { pub struct DuniterServer {
bc_db: BcV2Db<FileBackend>, bc_db: BcV2Db<FileBackend>,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment