deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/strace: fix build without fork

Browse source 
Fixes:
 - http://autobuild.buildroot.org/results/ffc81d3798379a9c34c7a708ebbdea27409f755d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2020-04-14 13:56:41 +02:00 committed by Thomas Petazzoni
parent dc97e968c2
commit 7925e19fd7
1 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
package/strace/0001-ptrace_syscall_info.c-fix-build-without-fork.patch Normal file
View file

@ -0,0 +1,56 @@
From ba0d1193b31e8822744ae250d8e984dad32e7e49 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 14 Apr 2020 13:45:29 +0200
Subject: [PATCH] ptrace_syscall_info.c: fix build without fork
Build without fork fails on:
ptrace_syscall_info.c:33:27: error: 'expected_entry_size' defined but not used [-Werror=unused-const-variable=]
static const unsigned int expected_entry_size =
^~~~~~~~~~~~~~~~~~~
ptrace_syscall_info.c:31:27: error: 'expected_none_size' defined but not used [-Werror=unused-const-variable=]
static const unsigned int expected_none_size =
^~~~~~~~~~~~~~~~~~
ptrace_syscall_info.c:24:1: error: 'kill_tracee' defined but not used [-Werror=unused-function]
kill_tracee(pid_t pid)
^~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/ffc81d3798379a9c34c7a708ebbdea27409f755d
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream: https://github.com/strace/strace/commit/897f3d053305ae2fb8e99371b4effb9b3f5c0000]
---
ptrace_syscall_info.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ptrace_syscall_info.c b/ptrace_syscall_info.c
index acea27ec..0bfd91c5 100644
--- a/ptrace_syscall_info.c
+++ b/ptrace_syscall_info.c
@@ -20,18 +20,20 @@
bool ptrace_get_syscall_info_supported;
+#define FAIL do { ptrace_stop = -1U; goto done; } while (0)
+
+#ifdef HAVE_FORK
static int
kill_tracee(pid_t pid)
{
return kill_save_errno(pid, SIGKILL);
}
-#define FAIL do { ptrace_stop = -1U; goto done; } while (0)
-
static const unsigned int expected_none_size =
offsetof(struct_ptrace_syscall_info, entry);
static const unsigned int expected_entry_size =
offsetofend(struct_ptrace_syscall_info, entry.args);
+#endif /* HAVE_FORK */
static const unsigned int expected_exit_size =
offsetofend(struct_ptrace_syscall_info, exit.is_error);
static const unsigned int expected_seccomp_size =
--
2.25.1