diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index cd5eae5c19..1dfa70e5bd 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -19,65 +19,70 @@ index 228267f..8fa1c1e 100644 - if platform.machine() in ("ppc64le", "ppc64", "powerpc"): + if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc"): cargo_args.extend( - ["--no-default-features", "--features=auditwheel,log,human-panic"] + ["--no-default-features", "--features=upload,log,human-panic"] ) diff --git src/target.rs src/target.rs -index d13cc34..66cc823 100644 --- src/target.rs +++ src/target.rs -@@ -58,6 +58,8 @@ enum Arch { - ARMV7L, - POWERPC64LE, - POWERPC64, -+ POWERPCLE, -+ POWERPC, +@@ -41,6 +41,8 @@ + Armv7L, + Powerpc64Le, + Powerpc64, ++ PowerpcLe, ++ Powerpc, X86, X86_64, - } -@@ -69,6 +71,8 @@ impl fmt::Display for Arch { - 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"), + S390X, +@@ -53,6 +55,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"), - } -@@ -109,6 +113,16 @@ impl Target { - platforms::target::Arch::X86 => Arch::X86, - platforms::target::Arch::ARM => Arch::ARMV7L, - platforms::target::Arch::AARCH64 => Arch::AARCH64, + Arch::S390X => write!(f, "s390x"), +@@ -68,6 +72,8 @@ + Arch::Armv7L, + Arch::Powerpc64, + Arch::Powerpc64Le, ++ Arch::PowerpcLe, ++ Arch::Powerpc, + Arch::X86, + Arch::X86_64, + ], +@@ -125,6 +131,16 @@ + { + Arch::Powerpc64Le + } + platforms::target::Arch::POWERPC + if platform.target_triple.starts_with("powerpc-") => + { -+ Arch::POWERPC ++ Arch::Powerpc + } + platforms::target::Arch::POWERPC + if platform.target_triple.starts_with("powerpcle-") => + { -+ Arch::POWERPCLE ++ Arch::PowerpcLe + } - platforms::target::Arch::POWERPC64 - if platform.target_triple.starts_with("powerpc64-") => - { -@@ -147,6 +161,8 @@ impl Target { + unsupported => bail!("The architecture {} is not supported", unsupported), + }; + +@@ -193,7 +209,7 @@ + /// Returns the default Manylinux tag for this architecture + pub fn get_default_manylinux_tag(&self) -> Manylinux { match self.arch { - Arch::AARCH64 => 64, - Arch::ARMV7L => 32, -+ Arch::POWERPC => 32, -+ Arch::POWERPCLE => 32, - Arch::POWERPC64 => 64, - Arch::POWERPC64LE => 64, +- Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::S390X => { ++ Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::Powerpc | Arch::PowerpcLe | Arch::S390X => { + Manylinux::Manylinux2014 + } + Arch::X86 | Arch::X86_64 => Manylinux::Manylinux2010, +@@ -207,6 +223,8 @@ + Arch::Armv7L => 32, + Arch::Powerpc64 => 64, + Arch::Powerpc64Le => 64, ++ Arch::Powerpc => 32, ++ Arch::PowerpcLe => 32, Arch::X86 => 32, -@@ -210,6 +226,8 @@ impl Target { - (OS::FreeBSD, _) => "", // according imp.get_suffixes(), there are no such - (OS::Linux, Arch::AARCH64) => "aarch64-linux-gnu", // aka armv8-linux-gnueabihf - (OS::Linux, Arch::ARMV7L) => "arm-linux-gnueabihf", -+ (OS::Linux, Arch::POWERPC) => "powerpc-linux-gnu", -+ (OS::Linux, Arch::POWERPCLE) => "powerpcle-linux-gnu", - (OS::Linux, Arch::POWERPC64) => "powerpc64-linux-gnu", - (OS::Linux, Arch::POWERPC64LE) => "powerpc64le-linux-gnu", - (OS::Linux, Arch::X86) => "i386-linux-gnu", // not i686 --- -2.30.0 - + Arch::X86_64 => 64, + Arch::S390X => 64, diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index e97ae1cf09..daa38d2353 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,11 +1,11 @@ # Template file for 'maturin' pkgname=maturin -version=0.9.4 -revision=2 +version=0.10.3 +revision=1 build_style=cargo # Disable the 'rustls' feature, which leads to bad platform compatibility # The list of enabled features should be reconciled with each new release -configure_args="--no-default-features --features auditwheel,log,upload,human-panic" +configure_args="--no-default-features --features log,upload,human-panic" hostmakedepends="python3-setuptools python3-toml" makedepends="openssl-devel" depends="python3-toml" @@ -16,7 +16,7 @@ homepage="https://github.com/PyO3/maturin" # bump platforms version if it changes in Cargo.lock distfiles="${homepage}/archive/v${version}.tar.gz https://github.com/RustSec/platforms-crate/archive/v1.1.0.tar.gz" -checksum="130d39cc6ecae9b1cb5602d262c1a8a8230c8ddb3496d2397c49e565c0fc731a +checksum="48e42dc7b9da5d4aa523d6e6fb607434be4a3ac08639b9c278edf716255ed91b 2524984c2ef547bb54515828e4afad0e781a439d74cf0197cf168ec6c818594c" post_extract() {