wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-08 16:13:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

maturin: update to 0.10.3.

Browse source
This commit is contained in:
Andrew J. Hesford 2021-04-19 10:13:51 -04:00
parent 8a516b71c2
commit a2db2f743c
2 changed files with 53 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
srcpkgs/maturin/patches/add-ppc-tier3.patch
View file

@ -19,65 +19,70 @@ index 228267f..8fa1c1e 100644
- if platform.machine() in ("ppc64le", "ppc64", "powerpc"): - if platform.machine() in ("ppc64le", "ppc64", "powerpc"):
+ if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc"): + if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc"):
cargo_args.extend( 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 diff --git src/target.rs src/target.rs
index d13cc34..66cc823 100644
--- src/target.rs --- src/target.rs
+++ src/target.rs +++ src/target.rs
@@ -58,6 +58,8 @@ enum Arch { @@ -41,6 +41,8 @@
ARMV7L, Armv7L,
POWERPC64LE, Powerpc64Le,
POWERPC64, Powerpc64,
+ POWERPCLE, + PowerpcLe,
+ POWERPC, + Powerpc,
X86, X86,
X86_64, X86_64,
} S390X,
@@ -69,6 +71,8 @@ impl fmt::Display for Arch { @@ -53,6 +55,8 @@
Arch::ARMV7L => write!(f, "armv7l"), Arch::Armv7L => write!(f, "armv7l"),
Arch::POWERPC64LE => write!(f, "ppc64le"), Arch::Powerpc64Le => write!(f, "ppc64le"),
Arch::POWERPC64 => write!(f, "ppc64"), Arch::Powerpc64 => write!(f, "ppc64"),
+ Arch::POWERPCLE => write!(f, "ppcle"), + Arch::PowerpcLe => write!(f, "ppcle"),
+ Arch::POWERPC => write!(f, "ppc"), + Arch::Powerpc => write!(f, "ppc"),
Arch::X86 => write!(f, "i686"), Arch::X86 => write!(f, "i686"),
Arch::X86_64 => write!(f, "x86_64"), Arch::X86_64 => write!(f, "x86_64"),
} Arch::S390X => write!(f, "s390x"),
@@ -109,6 +113,16 @@ impl Target { @@ -68,6 +72,8 @@
platforms::target::Arch::X86 => Arch::X86, Arch::Armv7L,
platforms::target::Arch::ARM => Arch::ARMV7L, Arch::Powerpc64,
platforms::target::Arch::AARCH64 => Arch::AARCH64, Arch::Powerpc64Le,
+ Arch::PowerpcLe,
+ Arch::Powerpc,
Arch::X86,
Arch::X86_64,
],
@@ -125,6 +131,16 @@
{
Arch::Powerpc64Le
}
+ platforms::target::Arch::POWERPC + platforms::target::Arch::POWERPC
+ if platform.target_triple.starts_with("powerpc-") => + if platform.target_triple.starts_with("powerpc-") =>
+ { + {
+ Arch::POWERPC + Arch::Powerpc
+ } + }
+ platforms::target::Arch::POWERPC + platforms::target::Arch::POWERPC
+ if platform.target_triple.starts_with("powerpcle-") => + if platform.target_triple.starts_with("powerpcle-") =>
+ { + {
+ Arch::POWERPCLE + Arch::PowerpcLe
+ } + }
platforms::target::Arch::POWERPC64 unsupported => bail!("The architecture {} is not supported", unsupported),
if platform.target_triple.starts_with("powerpc64-") => };
{
@@ -147,6 +161,8 @@ impl Target {
match self.arch {
Arch::AARCH64 => 64,
Arch::ARMV7L => 32,
+ Arch::POWERPC => 32,
+ Arch::POWERPCLE => 32,
Arch::POWERPC64 => 64,
Arch::POWERPC64LE => 64,
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
@@ -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 | 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,
Arch::X86_64 => 64,
Arch::S390X => 64,

8
srcpkgs/maturin/template
View file

@ -1,11 +1,11 @@
# Template file for 'maturin' # Template file for 'maturin'
pkgname=maturin pkgname=maturin
version=0.9.4 version=0.10.3
revision=2 revision=1
build_style=cargo build_style=cargo
# Disable the 'rustls' feature, which leads to bad platform compatibility # Disable the 'rustls' feature, which leads to bad platform compatibility
# The list of enabled features should be reconciled with each new release # 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" hostmakedepends="python3-setuptools python3-toml"
makedepends="openssl-devel" makedepends="openssl-devel"
depends="python3-toml" depends="python3-toml"
@ -16,7 +16,7 @@ homepage="https://github.com/PyO3/maturin"
# bump platforms version if it changes in Cargo.lock # bump platforms version if it changes in Cargo.lock
distfiles="${homepage}/archive/v${version}.tar.gz distfiles="${homepage}/archive/v${version}.tar.gz
https://github.com/RustSec/platforms-crate/archive/v1.1.0.tar.gz" https://github.com/RustSec/platforms-crate/archive/v1.1.0.tar.gz"
checksum="130d39cc6ecae9b1cb5602d262c1a8a8230c8ddb3496d2397c49e565c0fc731a checksum="48e42dc7b9da5d4aa523d6e6fb607434be4a3ac08639b9c278edf716255ed91b
2524984c2ef547bb54515828e4afad0e781a439d74cf0197cf168ec6c818594c" 2524984c2ef547bb54515828e4afad0e781a439d74cf0197cf168ec6c818594c"
post_extract() { post_extract() {