From dbedd42687d8c466c62b529887b50c48d16d3a2d Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 4 Oct 2022 10:08:32 +0800 Subject: [PATCH 1/2] Downgrade indicatif to fix build on some 32-bit platforms --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- Changelog.md | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a0f20da6..6078f68a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -254,9 +254,9 @@ dependencies = [ [[package]] name = "cargo-xwin" -version = "0.10.4" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ba119cbe3998beb157dff447d37fd845aa728b40c7ce9bcc472e486679ee1e" +checksum = "0b4d44af0e3fdd773cbf70b6b826a28993839be0a36c2b7c00c47f2dadaca6c6" dependencies = [ "anyhow", "cargo-options", @@ -1127,9 +1127,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.1" +version = "0.17.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfddc9561e8baf264e0e45e197fd7696320026eb10a8180340debc27b18f535b" +checksum = "2946516aa80379c1e6ee9cfa75a7b2faf23f63690f44d682e7fecd0141bbcaf2" dependencies = [ "console", "number_prefix", @@ -2857,9 +2857,9 @@ dependencies = [ [[package]] name = "xwin" -version = "0.2.8" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d800084cf7137e4a3e80587ff027d53943e05586a50a3655c2622e6700ba3f" +checksum = "3f66ef70cc262a6da73cb13fae0c767add6bd0b85fa46053b263732fecfb9b9f" dependencies = [ "anyhow", "bytes", diff --git a/Cargo.toml b/Cargo.toml index afa861659..a6dcc4fbc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ glob = "0.3.0" cargo_metadata = "0.15.0" cargo-options = "0.3.1" cargo-zigbuild = "0.12.3" -cargo-xwin = { version = "0.10.4", default-features = false } +cargo-xwin = { version = "=0.10.2", default-features = false } cbindgen = { version = "0.24.2", default-features = false } flate2 = "1.0.18" goblin = "0.5.4" diff --git a/Changelog.md b/Changelog.md index c3777d3ba..64f6ea9f2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Fix `maturin develop` in Windows conda virtual environment in [#1146](https://github.com/PyO3/maturin/pull/1146) * Fix build for crate using `pyo3` and `build.rs` without `cdylib` crate type in [#1150](https://github.com/PyO3/maturin/pull/1150) +* Fix build on some 32-bit platform by downgrading `indicatif` in [#1163](https://github.com/PyO3/maturin/pull/1163) ## [0.13.5] - 2022-09-27 From 1e507b4f5c2c39ebf8279fe2fab3512cf3e97588 Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 4 Oct 2022 10:09:03 +0800 Subject: [PATCH 2/2] Deny upgrading to indicatif 0.17 for now --- deny.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/deny.toml b/deny.toml index 579f3c287..d6fa9c4c7 100644 --- a/deny.toml +++ b/deny.toml @@ -167,6 +167,7 @@ deny = [ # is a direct dependency of the otherwise banned crate #{ name = "ansi_term", version = "=0.11.0", wrappers = [] }, { name = "rustix" }, + { name = "indicatif", version = ">=0.17.0" }, ] # Certain crates/versions that will be skipped when doing duplicate detection. skip = [