Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allow for compilation on aarch64 #1204

Merged
merged 2 commits into from
Jul 23, 2020
Merged

feat: allow for compilation on aarch64 #1204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
316051f
feat: allow for compilation on aarch64
dignifiedquire Jul 7, 2020
4d2a936
upload deps
keyvank Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,3 @@ members = [
"fil-proofs-tooling",
"sha2raw"
]

[patch.crates-io]
fil-sapling-crypto = { git = "https://github.com/filecoin-project/sapling-crypto", branch = "fix/compile-nonx86" }
fff = { git = "https://github.com/filecoin-project/ff", branch = "fix-arch" }
4 changes: 2 additions & 2 deletions fil-proofs-tooling/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ chrono = { version = "0.4.7", features = ["serde"] }
memmap = "0.7.0"
bellperson = "0.9.1"
paired = "0.20.0"
fil-sapling-crypto = "0.6.0"
fil-sapling-crypto = "0.6.3"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rust oddity, these individual patch version updates can be omitted. They don't hurt though ;-)

rand = "0.7"
storage-proofs = { path = "../storage-proofs"}
filecoin-proofs = { path = "../filecoin-proofs"}
Expand All @@ -41,7 +41,7 @@ uom = "0.28"
merkletree = "0.21.0"
bincode = "1.1.2"
anyhow = "1.0.23"
ff = { version = "0.2.0", package = "fff" }
ff = { version = "0.2.3", package = "fff" }
rand_xorshift = "0.2.0"
bytefmt = "0.1.7"
rayon = "1.3.0"
Expand Down
4 changes: 2 additions & 2 deletions filecoin-proofs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ serde_cbor = "0.11.1"
serde = { version = "1.0", features = ["rc", "derive"] }
serde_json = "1.0"
regex = "1.3.7"
ff = { version = "0.2.1", package = "fff" }
ff = { version = "0.2.3", package = "fff" }
blake2b_simd = "0.5"
bellperson = "0.9.1"
paired = "0.20.0"
fil-sapling-crypto = "0.6.0"
fil-sapling-crypto = "0.6.3"
clap = "2"
log = "0.4.7"
fil_logger = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions storage-proofs/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ serde = { version = "1.0", features = ["derive"]}
blake2b_simd = "0.5"
blake2s_simd = "0.5"
toml = "0.5"
ff = { version = "0.2.1", package = "fff" }
ff = { version = "0.2.3", package = "fff" }
bellperson = "0.9.1"
paired = { version = "0.20.0", features = ["serde"] }
fil-sapling-crypto = "0.6.0"
fil-sapling-crypto = "0.6.3"
serde_json = "1.0"
log = "0.4.7"
rand_chacha = "0.2.1"
Expand Down
5 changes: 2 additions & 3 deletions storage-proofs/porep/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ num-traits = "0.2"
sha2 = "0.9.1"
rayon = "1.0.0"
serde = { version = "1.0", features = ["derive"]}
ff = { version = "0.2.1", package = "fff" }
ff = { version = "0.2.3", package = "fff" }
bellperson = "0.9.1"
paired = { version = "0.20.0", features = ["serde"] }
fil-sapling-crypto = "0.6.0"
fil-sapling-crypto = "0.6.3"
log = "0.4.7"
pretty_assertions = "0.6.1"
generic-array = "0.13.2"
Expand All @@ -49,4 +49,3 @@ harness = false
[[bench]]
name = "parents"
harness = false

4 changes: 2 additions & 2 deletions storage-proofs/post/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ rayon = "1.0.0"
serde = { version = "1.0", features = ["derive"]}
blake2b_simd = "0.5"
blake2s_simd = "0.5"
ff = { version = "0.2.1", package = "fff" }
ff = { version = "0.2.3", package = "fff" }
bellperson = "0.9.1"
paired = { version = "0.20.0", features = ["serde"] }
fil-sapling-crypto = "0.6.0"
fil-sapling-crypto = "0.6.3"
log = "0.4.7"
hex = "0.4.0"
generic-array = "0.13.2"
Expand Down