fix build error for loongarch64
This commit is contained in:
Wenlong Zhang
parent
ff328b29a4
commit
23a1c87882
64
0002-backport-from-target-lexicon-0.12.7.patch
Normal file
64
0002-backport-from-target-lexicon-0.12.7.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From a40ade7076fae3e2a1b979bde952ded2d02dee86 Mon Sep 17 00:00:00 2001
|
||||
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
||||
Date: Wed, 16 Oct 2024 10:35:23 +0800
|
||||
Subject: [PATCH 1/2] backport from target lexicon 0.12.7
|
||||
|
||||
---
|
||||
vendor/target-lexicon/src/targets.rs | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/vendor/target-lexicon/src/targets.rs b/vendor/target-lexicon/src/targets.rs
|
||||
index 9fe4d79..5ae0e08 100644
|
||||
--- a/vendor/target-lexicon/src/targets.rs
|
||||
+++ b/vendor/target-lexicon/src/targets.rs
|
||||
@@ -24,6 +24,7 @@ pub enum Architecture {
|
||||
Hexagon,
|
||||
X86_32(X86_32Architecture),
|
||||
M68k,
|
||||
+ LoongArch64,
|
||||
Mips32(Mips32Architecture),
|
||||
Mips64(Mips64Architecture),
|
||||
Msp430,
|
||||
@@ -550,6 +551,7 @@ impl Architecture {
|
||||
| Bpfel
|
||||
| Hexagon
|
||||
| X86_32(_)
|
||||
+ | LoongArch64
|
||||
| Mips64(Mips64Architecture::Mips64el)
|
||||
| Mips32(Mips32Architecture::Mipsel)
|
||||
| Mips32(Mips32Architecture::Mipsisa32r6el)
|
||||
@@ -612,6 +614,7 @@ impl Architecture {
|
||||
| S390x
|
||||
| Sparc64
|
||||
| Sparcv9
|
||||
+ | LoongArch64
|
||||
| Wasm64
|
||||
| Clever(_) => Ok(PointerWidth::U64),
|
||||
}
|
||||
@@ -805,6 +808,7 @@ impl fmt::Display for Architecture {
|
||||
Bpfel => f.write_str("bpfel"),
|
||||
Hexagon => f.write_str("hexagon"),
|
||||
X86_32(x86_32) => x86_32.fmt(f),
|
||||
+ LoongArch64 => f.write_str("loongarch64"),
|
||||
M68k => f.write_str("m68k"),
|
||||
Mips32(mips32) => mips32.fmt(f),
|
||||
Mips64(mips64) => mips64.fmt(f),
|
||||
@@ -1002,6 +1006,7 @@ impl FromStr for Architecture {
|
||||
"bpfeb" => Bpfeb,
|
||||
"bpfel" => Bpfel,
|
||||
"hexagon" => Hexagon,
|
||||
+ "loongarch64" => LoongArch64,
|
||||
"m68k" => M68k,
|
||||
"msp430" => Msp430,
|
||||
"nvptx64" => Nvptx64,
|
||||
@@ -1484,6 +1489,7 @@ mod tests {
|
||||
"i686-uwp-windows-gnu",
|
||||
"i686-uwp-windows-msvc",
|
||||
"i686-wrs-vxworks",
|
||||
+ "loongarch64-unknown-linux-gnu",
|
||||
"m68k-unknown-linux-gnu",
|
||||
"mips64el-unknown-linux-gnuabi64",
|
||||
"mips64el-unknown-linux-muslabi64",
|
||||
--
|
||||
2.43.0
|
||||
|
||||
20
0003-modify-the-checksum-for-targets.rs.patch
Normal file
20
0003-modify-the-checksum-for-targets.rs.patch
Normal file
@ -0,0 +1,20 @@
|
||||
From fc77580c0ad107d94a41a0417eee7a75901672fa Mon Sep 17 00:00:00 2001
|
||||
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
||||
Date: Wed, 16 Oct 2024 10:36:07 +0800
|
||||
Subject: [PATCH 2/2] modify the checksum for targets.rs
|
||||
|
||||
---
|
||||
vendor/target-lexicon/.cargo-checksum.json | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vendor/target-lexicon/.cargo-checksum.json b/vendor/target-lexicon/.cargo-checksum.json
|
||||
index ac4e843..72be7ea 100644
|
||||
--- a/vendor/target-lexicon/.cargo-checksum.json
|
||||
+++ b/vendor/target-lexicon/.cargo-checksum.json
|
||||
@@ -1 +1 @@
|
||||
-{"files":{"Cargo.lock":"3f9fe47f92546d2475d36ea515f213be6b1f1483675f45073c4af64e76b97fea","Cargo.toml":"cfd3238db153673f6e052ef87b2f62d407ab5bf2e607ea67ee5e3c7e53f38d26","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c3467056d91be3f59562158ee9604c729b5b5f473efbefb036032803eb76809e","build.rs":"4716b4f955c7a4cb39cb3b7521c1745d5110c1cbd1e054bca906e37f5e974675","examples/host.rs":"503bafddfb372123fe4dc0e7b8037808beb5bfe6df60c00d3315922bd3792c6c","examples/misc.rs":"49a579845450b7b020ed5c97dca142fc548725893cbc82f6f750ee0caab2beca","scripts/rust-targets.sh":"89564342916321c5bc35e772d374a7f0af22cc9ae6dcc0027eca48d2269f18cb","src/data_model.rs":"38c0c184ee65b882872298127d9c6878292bd12c139792e82328a5facc2428ae","src/host.rs":"d742406eba58f35c4c9f1041e506bb63d6c0eb752c2e88f4a6646538ef1aba38","src/lib.rs":"d18401920ad8b1bd1bce505c2c9f8bf8724f123919234d6007f80634b3d306d5","src/parse_error.rs":"b3735eabc0fd0a9dfdd6375662f20ec96a79852a00a05a98fb2e421545285e53","src/targets.rs":"163aa87aa34f1d838a519b98dbf2088be2b69c032f9c0c035fe41dfb68819870","src/triple.rs":"9c895dd10057242f5861f603ab60645223fe1d9539cd29b9a9fc77fd5ebbb629"},"package":"8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5"}
|
||||
\ No newline at end of file
|
||||
+{"files":{"Cargo.lock":"3f9fe47f92546d2475d36ea515f213be6b1f1483675f45073c4af64e76b97fea","Cargo.toml":"cfd3238db153673f6e052ef87b2f62d407ab5bf2e607ea67ee5e3c7e53f38d26","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c3467056d91be3f59562158ee9604c729b5b5f473efbefb036032803eb76809e","build.rs":"4716b4f955c7a4cb39cb3b7521c1745d5110c1cbd1e054bca906e37f5e974675","examples/host.rs":"503bafddfb372123fe4dc0e7b8037808beb5bfe6df60c00d3315922bd3792c6c","examples/misc.rs":"49a579845450b7b020ed5c97dca142fc548725893cbc82f6f750ee0caab2beca","scripts/rust-targets.sh":"89564342916321c5bc35e772d374a7f0af22cc9ae6dcc0027eca48d2269f18cb","src/data_model.rs":"38c0c184ee65b882872298127d9c6878292bd12c139792e82328a5facc2428ae","src/host.rs":"d742406eba58f35c4c9f1041e506bb63d6c0eb752c2e88f4a6646538ef1aba38","src/lib.rs":"d18401920ad8b1bd1bce505c2c9f8bf8724f123919234d6007f80634b3d306d5","src/parse_error.rs":"b3735eabc0fd0a9dfdd6375662f20ec96a79852a00a05a98fb2e421545285e53","src/targets.rs":"0f8719668e21bd4f15d09310377b4968765233234e9ed677801ab1becb6926d8","src/triple.rs":"9c895dd10057242f5861f603ab60645223fe1d9539cd29b9a9fc77fd5ebbb629"},"package":"8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5"}
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 0.19.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Simple, modern and high performance file watching and code reload in python.
|
||||
|
||||
License: MIT
|
||||
@ -11,6 +11,8 @@ URL: https://github.com/samuelcolvin/watchfiles
|
||||
Source0: https://files.pythonhosted.org/packages/b3/17/d9453f774dd079fbe7d51565d58006f5059fc17c2fbcf952ef176fbb8657/watchfiles-0.19.0.tar.gz
|
||||
Source1: cargo-vendor-cache
|
||||
Patch1: 0001-set-cargo-vendor-cache-for-local-build.patch
|
||||
Patch2: 0002-backport-from-target-lexicon-0.12.7.patch
|
||||
Patch3: 0003-modify-the-checksum-for-targets.rs.patch
|
||||
|
||||
BuildRequires: rust-packaging
|
||||
|
||||
@ -33,8 +35,11 @@ Simple, modern and high performance file watching and code reload in python.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{pypi_name}-%{version}
|
||||
%setup -n %{pypi_name}-%{version}
|
||||
%patch1 -p1
|
||||
tar xzvf %{SOURCE1} -C .
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%pyproject_build
|
||||
@ -50,5 +55,8 @@ tar xzvf %{SOURCE1} -C .
|
||||
%{python3_sitearch}/%{pypi_name}*.dist-info/
|
||||
|
||||
%changelog
|
||||
* Wed Oct 16 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 0.19.0-2
|
||||
- fix build error for loongarch64
|
||||
|
||||
* Wed Aug 9 2023 Dongxing Wang <dxwangk@isoftstone.com> - 0.19.0-1
|
||||
- Initial package
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user