From e539611b602db7425ba98a9654eacdd841b59f53 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:11:20 -0400 Subject: [PATCH] maturin: update to 0.12.17. --- srcpkgs/maturin/patches/add-ppc-tier3.patch | 24 ++++++++++----------- srcpkgs/maturin/template | 11 +++------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index b19d2ada15e..a0a0111a9d7 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -1,15 +1,3 @@ -diff -u a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -71,7 +71,7 @@ - "--message-format=json", - ] - -- if platform.machine() in ("ppc64le", "ppc64", "powerpc") or ( -+ if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc") or ( - sys.platform == "win32" and platform.machine() == "ARM64" - ): - cargo_args.extend( diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs --- a/src/auditwheel/policy.rs +++ b/src/auditwheel/policy.rs @@ -90,3 +78,15 @@ diff -u a/src/target.rs.orig b/src/target.rs Arch::X86 => 32, Arch::X86_64 => 64, Arch::S390X => 64, +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") or ( ++if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc") or ( + sys.platform == "win32" and platform.machine() == "ARM64" + ): + cargo_args.extend(["--no-default-features", "--features=upload,log,human-panic"]) diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index fa332fc4282..4b729f29e8b 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,13 +1,13 @@ # Template file for 'maturin' pkgname=maturin -version=0.12.15 +version=0.12.17 revision=1 build_style=cargo build_helper=qemu # 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 log,upload,human-panic" -hostmakedepends="python3-setuptools python3-tomli" +hostmakedepends="python3-setuptools-rust python3-tomli" makedepends="openssl-devel" depends="python3-tomli" short_desc="Build and publish crates as python packages" @@ -17,7 +17,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.3.tar.gz>target-lexicon-${version}.tar.gz" -checksum="aa640e1620dc466778cd48f0c9cefe08a9ade265c7f0582b005c25e9f1518be4 +checksum="99a138c070455053a29a2dbcfeec7e28cc5d370691f02ea07467b2cd636fce3f 30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e" # Tests use unstable features and fail to build make_check=no @@ -28,11 +28,6 @@ post_extract() { echo "target-lexicon = { path = './target-lexicon' }" >> Cargo.toml } -post_patch() { - # setup.py is broken, just use it for the pure python part - vsed -e 's/cmdclass.*/packages=["maturin"],/' -i setup.py -} - post_build() { # python package is pure; the cross environment is not relevant python3 setup.py build