diff options
| author | Anton Blanchard <anton@samba.org> | 2013-12-02 17:33:37 +1100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-01-08 23:21:26 +0100 |
| commit | 7c4cd1afdf87c5bb63bfdd596458904b9747466f (patch) | |
| tree | d769e731db56dbcc5a11df3d4f2f5fd7e69279dd /package/strace/strace-update-configure.patch | |
| parent | bf93f6a2e2f22f10e7257c0e987a2c319df1519a (diff) | |
| download | buildroot-7c4cd1afdf87c5bb63bfdd596458904b9747466f.tar.gz buildroot-7c4cd1afdf87c5bb63bfdd596458904b9747466f.zip | |
strace: Fix build issue with duplicate ptrace_peeksiginfo_args definition
Backport a patch from upstream to fix a conflict between glibc
headers and recent kernel headers (v3.10 or newer).
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/strace/strace-update-configure.patch')
| -rw-r--r-- | package/strace/strace-update-configure.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/strace/strace-update-configure.patch b/package/strace/strace-update-configure.patch new file mode 100644 index 0000000000..a5890b89b1 --- /dev/null +++ b/package/strace/strace-update-configure.patch @@ -0,0 +1,31 @@ +--- a/configure 2013-12-02 12:31:53.257634249 +1100 ++++ b/configure 2013-12-02 12:32:17.726085888 +1100 +@@ -6389,6 +6389,16 @@ + + + fi ++ac_fn_c_check_type "$LINENO" "struct ptrace_peeksiginfo_args" "ac_cv_type_struct_ptrace_peeksiginfo_args" "#include <sys/ptrace.h> ++" ++if test "x$ac_cv_type_struct_ptrace_peeksiginfo_args" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS 1 ++_ACEOF ++ ++ ++fi + + + ac_fn_c_check_type "$LINENO" "struct user_desc" "ac_cv_type_struct_user_desc" "#include <asm/ldt.h> +--- a/config.h.in.orig 2013-12-02 12:44:56.795927681 +1100 ++++ b/config.h.in 2013-12-02 12:45:07.524122894 +1100 +@@ -253,6 +253,9 @@ + /* Define to 1 if `msg_control' is a member of `struct msghdr'. */ + #undef HAVE_STRUCT_MSGHDR_MSG_CONTROL + ++/* Define to 1 if the system has the type `struct ptrace_peeksiginfo_args'. */ ++#undef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS ++ + /* Define to 1 if the system has the type `struct pt_all_user_regs'. */ + #undef HAVE_STRUCT_PT_ALL_USER_REGS + |
