mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
maturin: update to 0.14.16.
This commit is contained in:
parent
b61b28d053
commit
4ed550924a
3 changed files with 3 additions and 161 deletions
|
@ -1,93 +0,0 @@
|
||||||
diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs
|
|
||||||
--- a/src/auditwheel/policy.rs
|
|
||||||
+++ b/src/auditwheel/policy.rs
|
|
||||||
@@ -101,6 +101,8 @@
|
|
||||||
Arch::Armv7L => "libc.musl-armv7.so.1",
|
|
||||||
Arch::Powerpc64Le => "libc.musl-ppc64le.so.1",
|
|
||||||
Arch::Powerpc64 => "", // musllinux doesn't support ppc64
|
|
||||||
+ Arch::PowerpcLe => "", // musllinux doesn't support ppcle
|
|
||||||
+ Arch::Powerpc => "", // musllinux doesn't support ppc
|
|
||||||
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/setup.py b/setup.py
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -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
|
|
||||||
@@ -65,6 +65,8 @@
|
|
||||||
Powerpc64Le,
|
|
||||||
#[serde(alias = "ppc64")]
|
|
||||||
Powerpc64,
|
|
||||||
+ #[serde(alias = "ppcle")]
|
|
||||||
+ PowerpcLe,
|
|
||||||
#[serde(alias = "i686")]
|
|
||||||
X86,
|
|
||||||
X86_64,
|
|
||||||
@@ -82,6 +84,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"),
|
|
||||||
@@ -107,7 +110,7 @@
|
|
||||||
match self {
|
|
||||||
Arch::Aarch64 => "arm64",
|
|
||||||
Arch::Armv6L | Arch::Armv7L => "arm",
|
|
||||||
- Arch::Powerpc | Arch::Powerpc64Le | Arch::Powerpc64 => "powerpc",
|
|
||||||
+ Arch::Powerpc | Arch::Powerpc64Le | Arch::Powerpc64 | Arch::PowerpcLe => "powerpc",
|
|
||||||
Arch::X86 => "i386",
|
|
||||||
Arch::X86_64 => "amd64",
|
|
||||||
Arch::Riscv64 => "riscv",
|
|
||||||
@@ -128,6 +131,7 @@
|
|
||||||
Arch::Armv6L,
|
|
||||||
Arch::Armv7L,
|
|
||||||
Arch::Powerpc,
|
|
||||||
+ Arch::PowerpcLe,
|
|
||||||
Arch::Powerpc64,
|
|
||||||
Arch::Powerpc64Le,
|
|
||||||
Arch::S390X,
|
|
||||||
@@ -236,6 +240,7 @@
|
|
||||||
},
|
|
||||||
Architecture::Aarch64(_) => Arch::Aarch64,
|
|
||||||
Architecture::Powerpc => Arch::Powerpc,
|
|
||||||
+ Architecture::PowerpcLe => Arch::PowerpcLe,
|
|
||||||
Architecture::Powerpc64 => Arch::Powerpc64,
|
|
||||||
Architecture::Powerpc64le => Arch::Powerpc64Le,
|
|
||||||
Architecture::S390x => Arch::S390X,
|
|
||||||
@@ -422,6 +427,7 @@
|
|
||||||
Arch::Armv6L => "armv6l",
|
|
||||||
Arch::Armv7L => "armv7l",
|
|
||||||
Arch::Powerpc => "ppc",
|
|
||||||
+ Arch::PowerpcLe => "powerpcle",
|
|
||||||
Arch::Powerpc64Le => "powerpc64le",
|
|
||||||
Arch::Powerpc64 => "powerpc64",
|
|
||||||
Arch::X86 => "i386",
|
|
||||||
@@ -476,6 +482,7 @@
|
|
||||||
| Arch::Mips64el
|
|
||||||
| Arch::Mipsel
|
|
||||||
| Arch::Powerpc
|
|
||||||
+ | Arch::PowerpcLe
|
|
||||||
| Arch::Sparc64 => PlatformTag::Linux,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -496,6 +503,7 @@
|
|
||||||
| Arch::X86
|
|
||||||
| Arch::Wasm32
|
|
||||||
| Arch::Mipsel
|
|
||||||
+ | Arch::PowerpcLe
|
|
||||||
| Arch::Powerpc => 32,
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,42 +0,0 @@
|
||||||
--- a/target-lexicon/src/targets.rs
|
|
||||||
+++ b/target-lexicon/src/targets.rs
|
|
||||||
@@ -29,6 +29,7 @@
|
|
||||||
Msp430,
|
|
||||||
Nvptx64,
|
|
||||||
Powerpc,
|
|
||||||
+ PowerpcLe,
|
|
||||||
Powerpc64,
|
|
||||||
Powerpc64le,
|
|
||||||
Riscv32(Riscv32Architecture),
|
|
||||||
@@ -533,6 +534,7 @@
|
|
||||||
| Mips64(Mips64Architecture::Mipsisa64r6el)
|
|
||||||
| Msp430
|
|
||||||
| Nvptx64
|
|
||||||
+ | PowerpcLe
|
|
||||||
| Powerpc64le
|
|
||||||
| Riscv32(_)
|
|
||||||
| Riscv64(_)
|
|
||||||
@@ -574,6 +576,7 @@
|
|
||||||
| M68k
|
|
||||||
| Mips32(_)
|
|
||||||
| Powerpc
|
|
||||||
+ | PowerpcLe
|
|
||||||
| XTensa => Ok(PointerWidth::U32),
|
|
||||||
AmdGcn
|
|
||||||
| Bpfeb
|
|
||||||
@@ -763,6 +766,7 @@
|
|
||||||
Msp430 => f.write_str("msp430"),
|
|
||||||
Nvptx64 => f.write_str("nvptx64"),
|
|
||||||
Powerpc => f.write_str("powerpc"),
|
|
||||||
+ PowerpcLe => f.write_str("powerpcle"),
|
|
||||||
Powerpc64 => f.write_str("powerpc64"),
|
|
||||||
Powerpc64le => f.write_str("powerpc64le"),
|
|
||||||
Riscv32(riscv32) => riscv32.fmt(f),
|
|
||||||
@@ -943,6 +947,7 @@
|
|
||||||
"msp430" => Msp430,
|
|
||||||
"nvptx64" => Nvptx64,
|
|
||||||
"powerpc" => Powerpc,
|
|
||||||
+ "powerpcle" => PowerpcLe,
|
|
||||||
"powerpc64" => Powerpc64,
|
|
||||||
"powerpc64le" => Powerpc64le,
|
|
||||||
"s390x" => S390x,
|
|
|
@ -1,8 +1,7 @@
|
||||||
# Template file for 'maturin'
|
# Template file for 'maturin'
|
||||||
pkgname=maturin
|
pkgname=maturin
|
||||||
version=0.14.15
|
version=0.14.16
|
||||||
revision=1
|
revision=1
|
||||||
create_wrksrc=yes
|
|
||||||
build_style=python3-module
|
build_style=python3-module
|
||||||
build_helper="qemu rust"
|
build_helper="qemu rust"
|
||||||
hostmakedepends="python3-setuptools-rust python3-tomli python3-wheel cargo"
|
hostmakedepends="python3-setuptools-rust python3-tomli python3-wheel cargo"
|
||||||
|
@ -12,12 +11,8 @@ short_desc="Build and publish crates as python packages"
|
||||||
maintainer="Andrew J. Hesford <ajh@sideband.org>"
|
maintainer="Andrew J. Hesford <ajh@sideband.org>"
|
||||||
license="Apache-2.0, MIT"
|
license="Apache-2.0, MIT"
|
||||||
homepage="https://github.com/PyO3/maturin"
|
homepage="https://github.com/PyO3/maturin"
|
||||||
# bump target-lexicon version if it changes in Cargo.lock
|
distfiles="${homepage}/archive/v${version}.tar.gz"
|
||||||
_tlver="0.12.6"
|
checksum=f649ca80edbd3b9d9d9d679d7a63174de5f0c5190a57ccd258bc9e9784e3061d
|
||||||
distfiles="${homepage}/archive/v${version}.tar.gz
|
|
||||||
https://github.com/bytecodealliance/target-lexicon/archive/v${_tlver}.tar.gz>target-lexicon-${_tlver}.tar.gz"
|
|
||||||
checksum="60cbf8ff73a36333c3f5483ca679a52169839db381f06683d8e61a6c00c28cf7
|
|
||||||
0b80ee4cd10c0cd02e64bb2ea0ba376e21c5a3a130c941e58baba1864340c945"
|
|
||||||
# Tests use unstable features and fail to build
|
# Tests use unstable features and fail to build
|
||||||
make_check=no
|
make_check=no
|
||||||
|
|
||||||
|
@ -25,24 +20,6 @@ if [ "$CROSS_BUILD" ]; then
|
||||||
makedepends+=" rust-std"
|
makedepends+=" rust-std"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
|
||||||
ppc64*) ;;
|
|
||||||
ppc*)
|
|
||||||
broken="https://github.com/console-rs/indicatif/blob/main/src/state.rs#L2"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
post_extract() {
|
|
||||||
mv "maturin-${version}"/* .
|
|
||||||
mv "target-lexicon-${_tlver}" target-lexicon
|
|
||||||
echo "[patch.crates-io]" >> Cargo.toml
|
|
||||||
echo "target-lexicon = { path = './target-lexicon' }" >> Cargo.toml
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_configure() {
|
|
||||||
cargo update --package target-lexicon --precise "${_tlver}"
|
|
||||||
}
|
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense license-mit LICENSE-MIT
|
vlicense license-mit LICENSE-MIT
|
||||||
python3 setup.py install --prefix=/usr --root=${DESTDIR}
|
python3 setup.py install --prefix=/usr --root=${DESTDIR}
|
||||||
|
|
Loading…
Add table
Reference in a new issue