Attachment #16934 for bug #51325

View | Details | Raw Unified | Return to bug 51325
Collapse All | Expand All




Bring support of loongarch64 to nix 0.26

diff --git a/cosmic-greeter-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs b/cosmic-greeter-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
--- a/cosmic-greeter-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
+++ b/cosmic-greeter-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
@@ -42,7 +42,8 @@ mod consts {
     target_arch = "x86_64",
     target_arch = "aarch64",
     target_arch = "riscv32",
-    target_arch = "riscv64"
+    target_arch = "riscv64",
+    target_arch = "loongarch64"
 ))]
 mod consts {
     #[doc(hidden)]






Name: cosmic-greeter
Version: %ver_major.0
Release: alt0.0.port.2%beta

Summary: COSMIC Greeter
License: GPL-3.0

%endif
Source1: %name-%version%beta-cargo.tar
Patch10: cosmic-term-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
Patch11: cosmic-greeter-1.0.0-alt-nix-0.26-loongarch64.patch

Requires: greetd cosmic-comp


tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}

%patch10 -p1
%patch11 -p2
sed -i -e 's/"files":{[^}]*}/"files":{}/' \
    vendor/linux-raw-sys/.cargo-checksum.json \
    vendor/nix-0.26.4/.cargo-checksum.json

%build
export RUSTFLAGS="${RUSTFLAGS} -g"

%doc README*

%changelog
* Fri Sep 27 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.0.port.2.alpha.2
- add patch for old nix crate version

* Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2
- 1.0.0-alpha.2


Return to bug 51325

Line 0 Link Here

(-)a/cosmic-greeter-1.0.0-alt-nix-0.26-loongarch64.patch (+16 lines)
	1	Bring support of loongarch64 to nix 0.26
	2
	3	diff --git a/cosmic-greeter-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs b/cosmic-greeter-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
	4	--- a/cosmic-greeter-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
	5	+++ b/cosmic-greeter-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
	6	@@ -42,7 +42,8 @@ mod consts {
	7	target_arch = "x86_64",
	8	target_arch = "aarch64",
	9	target_arch = "riscv32",
	10	- target_arch = "riscv64"
	11	+ target_arch = "riscv64",
	12	+ target_arch = "loongarch64"
	13	))]
	14	mod consts {
	15	#[doc(hidden)]
	16

Lines 8-14 Link Here

(-)a/cosmic-greeter.spec (-2 / +8 lines)
8		8
9	Name: cosmic-greeter	9	Name: cosmic-greeter
10	Version: %ver_major.0	10	Version: %ver_major.0
11	Release: alt0.2%beta	11	Release: alt0.0.port.2%beta
12		12
13	Summary: COSMIC Greeter	13	Summary: COSMIC Greeter
14	License: GPL-3.0	14	License: GPL-3.0
Lines 24-29 Source: %name-%version%beta.tar Link Here
24	%endif	24	%endif
25	Source1: %name-%version%beta-cargo.tar	25	Source1: %name-%version%beta-cargo.tar
26	Patch10: cosmic-term-1.0.0-alt-linux-raw-sys-char-loongarch64.patch	26	Patch10: cosmic-term-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
		27	Patch11: cosmic-greeter-1.0.0-alt-nix-0.26-loongarch64.patch
27		28
28	Requires: greetd cosmic-comp	29	Requires: greetd cosmic-comp
29		30
Lines 48-55 cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config. Link Here
48	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}	49	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
49		50
50	%patch10 -p1	51	%patch10 -p1
		52	%patch11 -p2
51	sed -i -e 's/"files":{[^}]*}/"files":{}/' \	53	sed -i -e 's/"files":{[^}]*}/"files":{}/' \
52	vendor/linux-raw-sys/.cargo-checksum.json	54	vendor/linux-raw-sys/.cargo-checksum.json \
		55	vendor/nix-0.26.4/.cargo-checksum.json
53		56
54	%build	57	%build
55	export RUSTFLAGS="${RUSTFLAGS} -g"	58	export RUSTFLAGS="${RUSTFLAGS} -g"
Lines 71-76 just rootdir=%buildroot install Link Here
71	%doc README*	74	%doc README*
72		75
73	%changelog	76	%changelog
		77	* Fri Sep 27 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.0.port.2.alpha.2
		78	- add patch for old nix crate version
		79
74	* Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2	80	* Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2
75	- 1.0.0-alpha.2	81	- 1.0.0-alpha.2
76		82