From 3e14ed23d812a656e6c6050f2df0754e80eda75d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 19 Jun 2022 14:14:05 -0400 Subject: [PATCH] maturin: update to 0.12.20. --- srcpkgs/maturin/patches/add-ppc-tier3.patch | 136 ++++++++++---------- srcpkgs/maturin/template | 8 +- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index a0a0111a9d7..0a227729d9a 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -10,74 +10,6 @@ diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs Arch::X86 => "libc.musl-x86.so.1", Arch::X86_64 => "libc.musl-x86_64.so.1", Arch::S390X => "libc.musl-s390x.so.1", -diff -u a/src/target.rs.orig b/src/target.rs ---- a/src/target.rs -+++ b/src/target.rs -@@ -52,6 +52,10 @@ - Powerpc64Le, - #[serde(alias = "ppc64")] - Powerpc64, -+ #[serde(alias = "ppcle")] -+ PowerpcLe, -+ #[serde(alias = "ppc")] -+ Powerpc, - #[serde(alias = "i686")] - X86, - X86_64, -@@ -65,6 +69,8 @@ - Arch::Armv7L => write!(f, "armv7l"), - Arch::Powerpc64Le => write!(f, "ppc64le"), - Arch::Powerpc64 => write!(f, "ppc64"), -+ Arch::PowerpcLe => write!(f, "ppcle"), -+ Arch::Powerpc => write!(f, "ppc"), - Arch::X86 => write!(f, "i686"), - Arch::X86_64 => write!(f, "x86_64"), - Arch::S390X => write!(f, "s390x"), -@@ -80,6 +86,8 @@ - Arch::Armv7L, - Arch::Powerpc64, - Arch::Powerpc64Le, -+ Arch::PowerpcLe, -+ Arch::Powerpc, - Arch::S390X, - Arch::X86, - Arch::X86_64, -@@ -154,6 +162,8 @@ - target_lexicon::Architecture::Aarch64(_) => Arch::Aarch64, - target_lexicon::Architecture::Powerpc64 => Arch::Powerpc64, - target_lexicon::Architecture::Powerpc64le => Arch::Powerpc64Le, -+ target_lexicon::Architecture::PowerpcLe => Arch::PowerpcLe, -+ target_lexicon::Architecture::Powerpc => Arch::Powerpc, - target_lexicon::Architecture::S390x => Arch::S390X, - unsupported => bail!("The architecture {} is not supported", unsupported), - }; -@@ -303,6 +313,8 @@ - Arch::Armv7L => "armv7l", - Arch::Powerpc64Le => "powerpc64le", - Arch::Powerpc64 => "powerpc64", -+ Arch::PowerpcLe => "powerpcle", -+ Arch::Powerpc => "powerpc", - Arch::X86 => "i386", - Arch::X86_64 => "x86_64", - Arch::S390X => "s390x", -@@ -327,7 +339,7 @@ - /// Returns the oldest possible Manylinux tag for this architecture - pub fn get_minimum_manylinux_tag(&self) -> PlatformTag { - match self.arch { -- Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::S390X => { -+ Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::PowerpcLe | Arch::Powerpc | Arch::S390X => { - PlatformTag::manylinux2014() - } - Arch::X86 | Arch::X86_64 => PlatformTag::manylinux2010(), -@@ -341,6 +353,8 @@ - Arch::Armv7L => 32, - Arch::Powerpc64 => 64, - Arch::Powerpc64Le => 64, -+ Arch::Powerpc => 32, -+ Arch::PowerpcLe => 32, - Arch::X86 => 32, - Arch::X86_64 => 64, - Arch::S390X => 64, diff -u a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -90,3 +22,71 @@ diff -u a/setup.py b/setup.py sys.platform == "win32" and platform.machine() == "ARM64" ): cargo_args.extend(["--no-default-features", "--features=upload,log,human-panic"]) +diff -u a/src/target.rs b/src/target.rs +--- a/src/target.rs ++++ b/src/target.rs +@@ -53,6 +53,10 @@ + Powerpc64Le, + #[serde(alias = "ppc64")] + Powerpc64, ++ #[serde(alias = "ppcle")] ++ PowerpcLe, ++ #[serde(alias = "ppc")] ++ Powerpc, + #[serde(alias = "i686")] + X86, + X86_64, +@@ -67,6 +71,8 @@ + Arch::Armv7L => write!(f, "armv7l"), + Arch::Powerpc64Le => write!(f, "ppc64le"), + Arch::Powerpc64 => write!(f, "ppc64"), ++ Arch::PowerpcLe => write!(f, "ppcle"), ++ Arch::Powerpc => write!(f, "ppc"), + Arch::X86 => write!(f, "i686"), + Arch::X86_64 => write!(f, "x86_64"), + Arch::S390X => write!(f, "s390x"), +@@ -83,6 +89,8 @@ + Arch::Armv7L, + Arch::Powerpc64, + Arch::Powerpc64Le, ++ Arch::PowerpcLe, ++ Arch::Powerpc, + Arch::S390X, + Arch::X86, + Arch::X86_64, +@@ -162,6 +170,8 @@ + target_lexicon::Architecture::Aarch64(_) => Arch::Aarch64, + target_lexicon::Architecture::Powerpc64 => Arch::Powerpc64, + target_lexicon::Architecture::Powerpc64le => Arch::Powerpc64Le, ++ target_lexicon::Architecture::PowerpcLe => Arch::PowerpcLe, ++ target_lexicon::Architecture::Powerpc => Arch::Powerpc, + target_lexicon::Architecture::S390x => Arch::S390X, + unsupported => bail!("The architecture {} is not supported", unsupported), + }; +@@ -321,6 +331,8 @@ + Arch::Armv7L => "armv7l", + Arch::Powerpc64Le => "powerpc64le", + Arch::Powerpc64 => "powerpc64", ++ Arch::PowerpcLe => "powerpcle", ++ Arch::Powerpc => "powerpc", + Arch::X86 => "i386", + Arch::X86_64 => "x86_64", + Arch::S390X => "s390x", +@@ -345,7 +357,7 @@ + /// Returns the oldest possible Manylinux tag for this architecture + pub fn get_minimum_manylinux_tag(&self) -> PlatformTag { + match self.arch { +- Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::S390X => { ++ Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::PowerpcLe | Arch::Powerpc | Arch::S390X => { + PlatformTag::manylinux2014() + } + Arch::X86 | Arch::X86_64 => PlatformTag::manylinux2010(), +@@ -357,7 +369,7 @@ + pub fn pointer_width(&self) -> usize { + match self.arch { + Arch::Aarch64 | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::X86_64 | Arch::S390X => 64, +- Arch::Armv6L | Arch::Armv7L | Arch::X86 => 32, ++ Arch::Armv6L | Arch::Armv7L | Arch::X86 | Arch::PowerpcLe | Arch::Powerpc => 32, + } + } + diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 4b729f29e8b..199d3bca096 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=0.12.17 +version=0.12.20 revision=1 build_style=cargo build_helper=qemu @@ -16,9 +16,9 @@ license="Apache-2.0, MIT" 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.3.tar.gz>target-lexicon-${version}.tar.gz" -checksum="99a138c070455053a29a2dbcfeec7e28cc5d370691f02ea07467b2cd636fce3f - 30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e" + https://github.com/bytecodealliance/target-lexicon/archive/v0.12.4.tar.gz>target-lexicon-${version}.tar.gz" +checksum="5a1c9ed2acd8ea1edbe7e8b7ed78f2f6887eff77f696dbdd93f81b606960efbe + f801dbb02555852e90d56d5a71e73ee42678c1bc583bb62a2970d4158f6ab6de" # Tests use unstable features and fail to build make_check=no