Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

addpatch: ot-keys #4443

Closed
wants to merge 1 commit into from
Closed

addpatch: ot-keys #4443

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ot-keys/riscv64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git PKGBUILD PKGBUILD
index 782f73f..8667881 100644
--- PKGBUILD
+++ PKGBUILD
@@ -45,7 +45,7 @@ b2sums=('705b1da1c587118e11a4554f5abca7105210ad73656d27cc478fee2534830331a429bfd

prepare() {
# download dependencies
- cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this works on riscv64. The failing log because it just fixes at upstream HEAD, but not the latest tag.
@felixonmars Could you please try packaging from main HEAD?

Copy link
Contributor Author

@cybaol cybaol Jan 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, $(rustc -vV | sed -n 's/host: //p') outputs riscv64_unknown_linux_gnu on riscv machine, but rust needs riscv64gc_unknown_linux_gnu.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, $(rustc -vV | sed -n 's/host: //p') outpus riscv64_unknown_linux_gnu on riscv machine, but rust needs riscv64gc_unknown_linux_gnu.

I believe not.

[root@centiskorch /]# rustc -vV | sed -n 's/host: //p'
riscv64gc-unknown-linux-gnu
[root@centiskorch /]# rustc -V
rustc 1.83.0 (90b35a623 2024-11-26) (Arch Linux rust 1:1.83.0-2)
[root@centiskorch /]# uname -a
Linux centiskorch.felixc.at 6.1.80-2-sophgo-11457-g83ab3eda46e6 #1 SMP Sun, 21 Apr 2024 11:50:11 +0000 riscv64 GNU/Linux

Copy link
Contributor Author

@cybaol cybaol Jan 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://archriscv.felixc.at/.status/log.htm?url=logs/ot-keys/ot-keys-1.0.1-1.log outputs a different output.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, $(rustc -vV | sed -n 's/host: //p') outputs riscv64_unknown_linux_gnu on riscv machine, but rust needs riscv64gc_unknown_linux_gnu.

Are you using rust package from Arch Linux RISC-V? IIRC only alpine patches the rust triple to remove the gc part.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

archriscv.felixc.at/.status/log.htm?url=logs/ot-keys/ot-keys-1.0.1-1.log outputs a different output.

As I noted above, this is built from Commit f4f5d77d, which uses $CARCH-unknown-linux-gnu.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

archriscv.felixc.at/.status/log.htm?url=logs/ot-keys/ot-keys-1.0.1-1.log outputs a different output.

As I noted above, this is built from Commit f4f5d77d, which uses $CARCH-unknown-linux-gnu.

OK

+ cargo fetch --locked --target ${CARCH}gc-unknown-linux-gnu
}

build() {
Loading