Skip to contentSkip to conversation

package/strace: fix build without fork

PATCH New Fabrice Fontaine 2 participants 2 messages Apr 14, 2020 – Apr 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/strace: fix build without fork

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

---
 ...yscall_info.c-fix-build-without-fork.patch | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 package/strace/0001-ptrace_syscall_info.c-fix-build-without-fork.patch
package/strace/0001-ptrace_syscall_info.c-fix-build-without-fork.patch new file +56 -0
new file mode 100644
index 0000000000..c28eaddbab
@@ -0,0 +1,56 @@
+From ba0d1193b31e8822744ae250d8e984dad32e7e49 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+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 <[email protected]>
+[Upstream status: https://github.com/strace/strace/pull/135]
+---
+ 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
+
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/strace: fix build without fork

Quoted 8 lines · On Tue, 14 Apr 2020 13:56:41 +0200 Fabrice Fontaine…

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

---
 ...yscall_info.c-fix-build-without-fork.patch | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 package/strace/0001-ptrace_syscall_info.c-fix-build-without-fork.patch

Applied to master, thanks. I've even updated the upstream status of the patch, since it was applied upstream. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com