teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maturin: update to 0.12.15.

This commit is contained in:
Andrew J. Hesford 2022-05-12 09:41:25 -04:00
parent 530042f295
commit 9b328d42f1
2 changed files with 74 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
srcpkgs/maturin/patches/add-ppc-tier3.patch
View File

@ -1,7 +1,7 @@
diff -ur setup.py setup.py
diff -u a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@
@@ -71,7 +71,7 @@
"--message-format=json",
]
@ -10,66 +10,10 @@ diff -ur setup.py setup.py
sys.platform == "win32" and platform.machine() == "ARM64"
):
cargo_args.extend(
diff -ur src/target.rs src/target.rs
--- a/src/target.rs
+++ b/src/target.rs
@@ -40,6 +40,8 @@
Armv7L,
Powerpc64Le,
Powerpc64,
+ PowerpcLe,
+ Powerpc,
X86,
X86_64,
S390X,
@@ -52,6 +54,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"),
Arch::S390X => write!(f, "s390x"),
@@ -67,6 +71,8 @@
Arch::Armv7L,
Arch::Powerpc64,
Arch::Powerpc64Le,
+ Arch::PowerpcLe,
+ Arch::Powerpc,
Arch::S390X,
Arch::X86,
Arch::X86_64,
@@ -123,6 +129,8 @@
target_lexicon::Architecture::Aarch64(_) => Arch::Aarch64,
target_lexicon::Architecture::Powerpc64 => Arch::Powerpc64,
target_lexicon::Architecture::Powerpc64le => Arch::Powerpc64Le,
+ target_lexicon::Architecture::PowerpcLe => Arch::PowerpcLe,
+ target_lexicon::Architecture::Powerpc => Arch::Powerpc,
target_lexicon::Architecture::S390x => Arch::S390X,
unsupported => bail!("The architecture {} is not supported", unsupported),
};
@@ -200,7 +208,7 @@
/// Returns the default Manylinux tag for this architecture
pub fn get_default_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(),
@@ -214,6 +222,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,
diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs
--- a/src/auditwheel/policy.rs
+++ b/src/auditwheel/policy.rs
@@ -110,6 +110,8 @@
@@ -100,6 +100,8 @@
Arch::Armv7L => "libc.musl-armv7.so.1",
Arch::Powerpc64Le => "libc.musl-ppc64le.so.1",
Arch::Powerpc64 => "", // musllinux doesn't support ppc64
@ -78,3 +22,71 @@ diff -ur src/target.rs src/target.rs
Arch::X86 => "libc.musl-x86.so.1",
Arch::X86_64 => "libc.musl-x86_64.so.1",
Arch::S390X => "libc.musl-s390x.so.1",
diff -u a/src/target.rs.orig b/src/target.rs
--- a/src/target.rs
+++ b/src/target.rs
@@ -52,6 +52,10 @@
Powerpc64Le,
#[serde(alias = "ppc64")]
Powerpc64,
+ #[serde(alias = "ppcle")]
+ PowerpcLe,
+ #[serde(alias = "ppc")]
+ Powerpc,
#[serde(alias = "i686")]
X86,
X86_64,
@@ -65,6 +69,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"),
Arch::S390X => write!(f, "s390x"),
@@ -80,6 +86,8 @@
Arch::Armv7L,
Arch::Powerpc64,
Arch::Powerpc64Le,
+ Arch::PowerpcLe,
+ Arch::Powerpc,
Arch::S390X,
Arch::X86,
Arch::X86_64,
@@ -154,6 +162,8 @@
target_lexicon::Architecture::Aarch64(_) => Arch::Aarch64,
target_lexicon::Architecture::Powerpc64 => Arch::Powerpc64,
target_lexicon::Architecture::Powerpc64le => Arch::Powerpc64Le,
+ target_lexicon::Architecture::PowerpcLe => Arch::PowerpcLe,
+ target_lexicon::Architecture::Powerpc => Arch::Powerpc,
target_lexicon::Architecture::S390x => Arch::S390X,
unsupported => bail!("The architecture {} is not supported", unsupported),
};
@@ -303,6 +313,8 @@
Arch::Armv7L => "armv7l",
Arch::Powerpc64Le => "powerpc64le",
Arch::Powerpc64 => "powerpc64",
+ Arch::PowerpcLe => "powerpcle",
+ Arch::Powerpc => "powerpc",
Arch::X86 => "i386",
Arch::X86_64 => "x86_64",
Arch::S390X => "s390x",
@@ -327,7 +339,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(),
@@ -341,6 +353,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,

4
srcpkgs/maturin/template
View File

@ -1,6 +1,6 @@
# Template file for 'maturin'
pkgname=maturin
version=0.12.14
version=0.12.15
revision=1
build_style=cargo
build_helper=qemu
@ -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="4b45ef2f5a63d7dde7700556f60d82222c7ccba64cea70950f909b06e8355249
checksum="aa640e1620dc466778cd48f0c9cefe08a9ade265c7f0582b005c25e9f1518be4
30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
# Tests use unstable features and fail to build
make_check=no