1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-17 05:05:14 +03:00
aports/testing/rage/fix-build-32bit.patch
FollieHiyuki 475c7a5b9f testing/rage: upgrade to 0.9.0
Build rage-mount against fuse3 instead of fuse.
2022-11-06 19:16:23 +01:00

184 lines
4.6 KiB
Diff

Fix build on 32-bit archs by updating pprof-rs from 0.10.1 to 0.11.0.
Ref: https://github.com/tikv/pprof-rs/commit/09c0e73ab29cd2f586d0502397b3ea96ac8b2171
diff --git a/Cargo.lock b/Cargo.lock
index d11b2d9..0c75f90 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -65,7 +65,7 @@ dependencies = [
"cipher 0.4.3",
"console",
"cookie-factory",
- "criterion",
+ "criterion 0.3.6",
"criterion-cycles-per-byte",
"ctr",
"curve25519-dalek",
@@ -158,6 +158,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
[[package]]
name = "arrayvec"
version = "0.7.2"
@@ -385,6 +391,33 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "ciborium"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
[[package]]
name = "cipher"
version = "0.3.0"
@@ -532,7 +565,7 @@ dependencies = [
"atty",
"cast",
"clap 2.34.0",
- "criterion-plot",
+ "criterion-plot 0.4.5",
"csv",
"itertools",
"lazy_static",
@@ -549,13 +582,39 @@ dependencies = [
"walkdir",
]
+[[package]]
+name = "criterion"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+dependencies = [
+ "anes",
+ "atty",
+ "cast",
+ "ciborium",
+ "clap 3.2.23",
+ "criterion-plot 0.5.0",
+ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
[[package]]
name = "criterion-cycles-per-byte"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d34485a578330c7a91ccf064674f3739a7aebbf3b9d7fd498a6d3e8f7473c96"
dependencies = [
- "criterion",
+ "criterion 0.3.6",
]
[[package]]
@@ -568,6 +627,16 @@ dependencies = [
"itertools",
]
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
[[package]]
name = "crossbeam-channel"
version = "0.5.6"
@@ -1818,13 +1887,13 @@ dependencies = [
[[package]]
name = "pprof"
-version = "0.10.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6472bfed9475542ac46c518734a8d06d71b0f6cb2c17f904aa301711a57786f"
+checksum = "e20150f965e0e4c925982b9356da71c84bcd56cb66ef4e894825837cbcf6613e"
dependencies = [
"backtrace",
"cfg-if",
- "criterion",
+ "criterion 0.4.0",
"findshlibs",
"inferno",
"libc",
@@ -2368,9 +2437,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "symbolic-common"
-version = "9.2.1"
+version = "10.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "800963ba330b09a2ae4a4f7c6392b81fbc2784099a98c1eac68c3437aa9382b2"
+checksum = "ac457d054f793cedfde6f32d21d692b8351cfec9084fefd0470c0373f6d799bc"
dependencies = [
"debugid",
"memmap2",
@@ -2380,9 +2449,9 @@ dependencies = [
[[package]]
name = "symbolic-demangle"
-version = "9.2.1"
+version = "10.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b940a1fdbc72bb3369e38714efe6cd332dbbe46d093cf03d668b9ac390d1ad0"
+checksum = "48808b846eef84e0ac06365dc620f028ae632355e5dcffc007bf1b2bf5eab17b"
dependencies = [
"cpp_demangle",
"rustc-demangle",
diff --git a/age/Cargo.toml b/age/Cargo.toml
index e56e16d..96ee194 100644
--- a/age/Cargo.toml
+++ b/age/Cargo.toml
@@ -101,7 +101,7 @@ test-case = "2"
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
[target.'cfg(unix)'.dev-dependencies]
-pprof = { version = "0.10", features = ["criterion", "flamegraph"] }
+pprof = { version = "0.11", features = ["criterion", "flamegraph"] }
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dev-dependencies]
criterion-cycles-per-byte = "0.1"