projects/aports·blob master · refs

49 lines · 1.4 KiB

1Our 32bit builders don't need to try and fetch hardened-malloc, unsupported on
2those architectures, we'll use the default malloc instead
3
4--- a/Cargo.toml
5+++ b/Cargo.toml
6@@ -442,8 +442,6 @@ tracing-subscriber = { version = "0.3",
7 # GrapheneOS does not support 32-bit.
8 # GrapheneOS does not cross compile to android.
9 # Without small feature, riscv64 fails on cfarm9{4,5}.
10-[target.'cfg(all(target_pointer_width = "64", not(target_os = "android")) )'.dependencies]
11-hardened-malloc = { version = "13.0.0", default-features = false, features = ["tiny"] }
12
13 [build-dependencies]
14 pkg-config = "0.3"
15--- a/Cargo.lock
16+++ b/Cargo.lock
17@@ -763,24 +763,6 @@ dependencies = [
18 ]
19
20 [[package]]
21-name = "hardened-malloc"
22-version = "13.0.0"
23-source = "registry+https://github.com/rust-lang/crates.io-index"
24-checksum = "30194fcf44353db8cebecd80fcff611ec9b1323e7d98ccac611798169273832a"
25-dependencies = [
26- "hardened-malloc-sys",
27-]
28-
29-[[package]]
30-name = "hardened-malloc-sys"
31-version = "13.0.0"
32-source = "registry+https://github.com/rust-lang/crates.io-index"
33-checksum = "b142031155aba371b653dc55e0c164bb768adb1261105f87272b6721336f6466"
34-dependencies = [
35- "cc",
36-]
37-
38-[[package]]
39 name = "hashbrown"
40 version = "0.12.3"
41 source = "registry+https://github.com/rust-lang/crates.io-index"
42@@ -2094,7 +2076,6 @@ dependencies = [
43 "fixedbitset",
44 "goblin",
45 "gperftools",
46- "hardened-malloc",
47 "iced-x86",
48 "indexmap 2.13.0",
49 "io-uring",