From 5f62182d2b12f9848599c60d1a7339fd192dbd0b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 30 Jul 2022 21:51:14 -0400 Subject: [PATCH] maturin: update to 0.13.1. --- srcpkgs/maturin/patches/add-ppc-tier3.patch | 26 ++++++++++----------- srcpkgs/maturin/template | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index b78a0403064..4306344fae1 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -17,8 +17,8 @@ diff -u a/setup.py b/setup.py version = tomllib.load(fp)["package"]["version"] cargo_args = [] --if platform.machine() in ("ppc64le", "ppc64", "powerpc") or ( -+if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc") or ( +-if platform.machine() in ("ppc64le", "ppc64", "powerpc", "riscv64") or ( ++if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc", "riscv64") or ( sys.platform == "win32" and platform.machine() == "ARM64" ): cargo_args.extend(["--no-default-features", "--features=upload,log,human-panic"]) @@ -36,7 +36,7 @@ diff -u a/src/target.rs b/src/target.rs #[serde(alias = "i686")] X86, X86_64, -@@ -70,6 +74,8 @@ +@@ -71,6 +75,8 @@ Arch::Armv7L => write!(f, "armv7l"), Arch::Powerpc64Le => write!(f, "ppc64le"), Arch::Powerpc64 => write!(f, "ppc64"), @@ -45,7 +45,7 @@ diff -u a/src/target.rs b/src/target.rs Arch::X86 => write!(f, "i686"), Arch::X86_64 => write!(f, "x86_64"), Arch::S390X => write!(f, "s390x"), -@@ -87,6 +93,8 @@ +@@ -89,6 +95,8 @@ Arch::Armv7L, Arch::Powerpc64, Arch::Powerpc64Le, @@ -54,7 +54,7 @@ diff -u a/src/target.rs b/src/target.rs Arch::S390X, Arch::X86, Arch::X86_64, -@@ -167,6 +175,8 @@ +@@ -170,6 +178,8 @@ Architecture::Aarch64(_) => Arch::Aarch64, Architecture::Powerpc64 => Arch::Powerpc64, Architecture::Powerpc64le => Arch::Powerpc64Le, @@ -62,8 +62,8 @@ diff -u a/src/target.rs b/src/target.rs + Architecture::PowerpcLe => Arch::PowerpcLe, Architecture::S390x => Arch::S390X, Architecture::Wasm32 => Arch::Wasm32, - unsupported => bail!("The architecture {} is not supported", unsupported), -@@ -353,6 +363,8 @@ + Architecture::Riscv64(_) => Arch::Riscv64, +@@ -357,6 +367,8 @@ Arch::Armv7L => "armv7l", Arch::Powerpc64Le => "powerpc64le", Arch::Powerpc64 => "powerpc64", @@ -72,7 +72,7 @@ diff -u a/src/target.rs b/src/target.rs Arch::X86 => "i386", Arch::X86_64 => "x86_64", Arch::S390X => "s390x", -@@ -379,7 +391,7 @@ +@@ -384,7 +396,7 @@ /// Returns the oldest possible Manylinux tag for this architecture pub fn get_minimum_manylinux_tag(&self) -> PlatformTag { match self.arch { @@ -81,12 +81,12 @@ diff -u a/src/target.rs b/src/target.rs PlatformTag::manylinux2014() } Arch::X86 | Arch::X86_64 => PlatformTag::manylinux2010(), -@@ -391,7 +403,7 @@ - pub fn pointer_width(&self) -> usize { - match self.arch { - Arch::Aarch64 | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::X86_64 | Arch::S390X => 64, +@@ -401,7 +413,7 @@ + | Arch::X86_64 + | Arch::S390X + | Arch::Riscv64 => 64, - Arch::Armv6L | Arch::Armv7L | Arch::X86 | Arch::Wasm32 => 32, -+ Arch::Armv6L | Arch::Armv7L | Arch::X86 | Arch::PowerpcLe | Arch::Powerpc | Arch::Wasm32 => 32, ++ Arch::Armv6L | Arch::Armv7L | Arch::X86 | Arch::Wasm32 | Arch::Powerpc | Arch::PowerpcLe => 32, } } diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index f51398d30b0..2df00991727 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=0.13.0 +version=0.13.1 revision=1 build_style=python3-module build_helper="qemu rust" @@ -14,7 +14,7 @@ homepage="https://github.com/PyO3/maturin" # bump target-lexicon version if it changes in Cargo.lock distfiles="${homepage}/archive/v${version}.tar.gz https://github.com/bytecodealliance/target-lexicon/archive/v0.12.4.tar.gz>target-lexicon-${version}.tar.gz" -checksum="b44a22c65ccb00f25c53540889ee0358f79a40673adee38e8c75411deef60576 +checksum="9258fd7ce202ba57956f95f557310c6fcdf6c7715b4eee06630355885d227962 f801dbb02555852e90d56d5a71e73ee42678c1bc583bb62a2970d4158f6ab6de" # Tests use unstable features and fail to build make_check=no