Skip to content

Commit

Permalink
maturin: update to 0.12.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
ahesford committed Nov 26, 2021
1 parent f7b7299 commit 901a121
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
8 changes: 4 additions & 4 deletions srcpkgs/maturin/patches/add-ppc-tier3.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ diff -ur setup.py setup.py
"--message-format=json",
]

- if platform.machine() in ("ppc64le", "ppc64", "powerpc"):
+ if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc"):
- 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 -ur src/target.rs src/target.rs
--- a/src/target.rs
+++ b/src/target.rs
Expand Down
18 changes: 18 additions & 0 deletions srcpkgs/maturin/patches/edition2018.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Void can't yet compile with edition2021 and there seems to be no reason to
demand it, so partially revert

https://github.com/PyO3/maturin/commit/4d51112a18a331248bb36c0cb5b4c60c6fe0091a

and make maturin work.

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@
license = "MIT OR Apache-2.0"
keywords = ["python", "cffi", "packaging", "pypi", "pyo3"]
categories = ["api-bindings", "development-tools::ffi", "command-line-utilities"]
-edition = "2021"
+edition = "2018"

[badges]
travis-ci = { repository = "PyO3/maturin" }
6 changes: 3 additions & 3 deletions srcpkgs/maturin/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'maturin'
pkgname=maturin
version=0.11.5
version=0.12.2
revision=1
build_style=cargo
build_helper=qemu
Expand All @@ -16,8 +16,8 @@ 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.2.tar.gz"
checksum="33b67e66e725c76eac866c2174cfbe708e77a44d215878474d84bc5f9f6386f3
https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz>target-lexicon-${version}.tar.gz"
checksum="d66d21703a78d71061b279b97fb7dd15a925474da19bce9928d87f1c22550ed6
b6c2ddab7498cf6eab8e637a5b7895f3170b2f9ef989861d1ff33af6c8459b27"
# Tests use unstable features and fail to build
make_check=no
Expand Down

0 comments on commit 901a121

Please sign in to comment.