main/ltrace: fix build with gcc 14

gcc 14 caught a bug introduced in a musl fix for ppc64le.

fixes commit 29ecdbd2f3 (main/ltrace: add ppc64le support)
This commit is contained in:
Natanael Copa 2024-08-22 09:56:27 +02:00 committed by Kevin Daudt
parent 3ca4325c2b
commit 2cfb35ff94
3 changed files with 18 additions and 3 deletions

View file

@ -16,7 +16,9 @@ source="https://www.ltrace.org/ltrace_0.7.3.orig.tar.bz2
add_ppc64le.patch
mips.patch
ltrace_aarch64.patch
loongarch64.patch"
loongarch64.patch
gcc14.patch
"
prepare() {
default_prepare
@ -40,8 +42,9 @@ package() {
sha512sums="
a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d ltrace_0.7.3.orig.tar.bz2
c53e05471c52e161a7f7389994c6467e8f3671c5d8478546bc1897f067c62aeab848d728295f339a241a3fc186e180d47bcc2872a6335877c3813b1b62834698 musl.patch
987c6d18bdb559e8fe739f09cfb0b567dafcf79b2bd5db7ca32ebb205f3b1d74a8008576e4d73ea90873c1ab9bed17d96ddb7ad8752bf0a160ea0638c955eb1f add_ppc64le.patch
501a60df2df9d8ad31c89e97d92a158c9a8158eed9cb2d8536d286a26c53d967c727172b79147540ed44821a91b74799708d0b6e45ae713b4674d739f3f0fb9d add_ppc64le.patch
9cacf203143010cb09b480384b57543c16bdd2c1e0d32935385ce3a4af1df5d3ba4f2fa3e6053609aa4028957f60e10e365d241d387c5de1e82532942ca7eb0b mips.patch
23fd7e6afc0ab8ab00de46077c624ed2089761dbdc127f80594fbd5ca16053d8f9e8073bb05f6a05941bf89afddf1ee27bacb6f3ca1df29ecb1f2d6a59e27cf2 ltrace_aarch64.patch
ea95df4bdc78ca6f0b337ecd45116cee27ee2785eb2917b47b86af854690d153b197436c74294d48b80acd5aedc33f0cb0dde0f6cd07838c53989be975f96b55 loongarch64.patch
12fea0e8f693b2f3cc44242e6373f25ac55964755419100d3e4ec5cc7d8f998cd57837c4b09df8f07d505df144c56bd1c69812ac03d57fc9b5b416d52465ec74 gcc14.patch
"

View file

@ -45,7 +45,7 @@
- if (ptrace(PTRACE_POKEUSER, proc->pid, sizeof(long)*PT_NIP, addr) != 0)
- error(0, errno, "set_instruction_pointer");
+ if (ptrace(PTRACE_POKEUSER, proc->pid, sizeof(long)*PT_NIP, addr) != 0){
+ strerror(0, errno, "set_instruction_pointer");
+ // error(0, errno, "set_instruction_pointer");
+ report_global_error("%s: set_instruction_pointer",
+ strerror(errno));
+ }

12
main/ltrace/gcc14.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/sysdeps/linux-gnu/ppc/regs.c b/sysdeps/linux-gnu/ppc/regs.c
index 5b4d762..401d503 100644
--- a/sysdeps/linux-gnu/ppc/regs.c
+++ b/sysdeps/linux-gnu/ppc/regs.c
@@ -26,6 +26,7 @@
#include <sys/ptrace.h>
#include <asm/ptrace.h>
#include <errno.h>
+#include <string.h>
#ifdef HAVE_ERROR_H
#include <error.h>
#endif