diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index 4306344fae1..af1c16e15e5 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -13,80 +13,72 @@ diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs diff -u a/setup.py b/setup.py --- a/setup.py +++ b/setup.py -@@ -46,7 +46,7 @@ - version = tomllib.load(fp)["package"]["version"] - - cargo_args = [] --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"]) +@@ -52,6 +52,8 @@ + "ppc64le", + "ppc64", + "powerpc", ++ "ppcle", ++ "ppc", + "riscv64", + "sparc64", + ) or (sys.platform == "win32" and platform.machine() == "ARM64"): diff -u a/src/target.rs b/src/target.rs --- a/src/target.rs +++ b/src/target.rs -@@ -55,6 +55,10 @@ +@@ -58,6 +58,8 @@ Powerpc64Le, #[serde(alias = "ppc64")] Powerpc64, + #[serde(alias = "ppcle")] + PowerpcLe, -+ #[serde(alias = "ppc")] -+ Powerpc, #[serde(alias = "i686")] X86, X86_64, -@@ -71,6 +75,8 @@ +@@ -75,6 +77,7 @@ + Arch::Aarch64 => write!(f, "aarch64"), + Arch::Armv6L => write!(f, "armv6l"), Arch::Armv7L => write!(f, "armv7l"), ++ Arch::PowerpcLe => write!(f, "ppcle"), + Arch::Powerpc => write!(f, "ppc"), 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"), -@@ -89,6 +95,8 @@ +@@ -98,6 +101,7 @@ + Arch::Armv6L, Arch::Armv7L, + Arch::Powerpc, ++ Arch::PowerpcLe, Arch::Powerpc64, Arch::Powerpc64Le, -+ Arch::PowerpcLe, -+ Arch::Powerpc, Arch::S390X, - Arch::X86, - Arch::X86_64, -@@ -170,6 +178,8 @@ +@@ -186,6 +190,7 @@ + }, Architecture::Aarch64(_) => Arch::Aarch64, + Architecture::Powerpc => Arch::Powerpc, ++ Architecture::PowerpcLe => Arch::PowerpcLe, Architecture::Powerpc64 => Arch::Powerpc64, Architecture::Powerpc64le => Arch::Powerpc64Le, -+ Architecture::Powerpc => Arch::Powerpc, -+ Architecture::PowerpcLe => Arch::PowerpcLe, Architecture::S390x => Arch::S390X, - Architecture::Wasm32 => Arch::Wasm32, - Architecture::Riscv64(_) => Arch::Riscv64, -@@ -357,6 +367,8 @@ +@@ -377,6 +382,7 @@ + Arch::Armv6L => "armv6l", Arch::Armv7L => "armv7l", + Arch::Powerpc => "ppc", ++ Arch::PowerpcLe => "powerpcle", Arch::Powerpc64Le => "powerpc64le", Arch::Powerpc64 => "powerpc64", -+ Arch::PowerpcLe => "powerpcle", -+ Arch::Powerpc => "powerpc", Arch::X86 => "i386", - Arch::X86_64 => "x86_64", - Arch::S390X => "s390x", -@@ -384,7 +396,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(), -@@ -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::Wasm32 | Arch::Powerpc | Arch::PowerpcLe => 32, +@@ -429,6 +435,7 @@ + | Arch::Mips64el + | Arch::Mipsel + | Arch::Powerpc ++ | Arch::PowerpcLe + | Arch::Sparc64 => PlatformTag::Linux, + } + } +@@ -449,6 +456,7 @@ + | Arch::X86 + | Arch::Wasm32 + | Arch::Mipsel ++ | Arch::PowerpcLe + | Arch::Powerpc => 32, } } - diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 2df00991727..cf5039ffb20 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=0.13.1 +version=0.13.2 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="9258fd7ce202ba57956f95f557310c6fcdf6c7715b4eee06630355885d227962 +checksum="22afa6d4367eed3225a8650604483f13c127df612cb4ed66e074244c2344c668 f801dbb02555852e90d56d5a71e73ee42678c1bc583bb62a2970d4158f6ab6de" # Tests use unstable features and fail to build make_check=no @@ -38,13 +38,6 @@ post_install() { vlicense license-mit LICENSE-MIT python3 setup.py install --prefix=/usr --root=${DESTDIR} - # Wheel installers would move the data components into the main - # hierarchy automatically, but that doesn't happen here; do it manually. - # See https://peps.python.org/pep-0491/#the-data-directory - local _pydata="${DESTDIR}/${py3_sitelib}/maturin-${version}.data" - vmkdir usr/bin - mv "${_pydata}/scripts/maturin" "${DESTDIR}/usr/bin" - # Generate and install some completions local _matbin="${DESTDIR}/usr/bin/maturin" vtargetrun "${_matbin}" completions zsh > maturin.zsh