strace: unbreak - patch from Debian

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3957 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 18 insertions, 1 deletions

diff --git a/meta/packages/strace/strace/linux-headers-fix.patch b/meta/packages/strace/strace/linux-headers-fix.patch
new file mode 100644
index 0000000000..911950f912
--- /dev/null
+++ b/meta/packages/strace/strace/linux-headers-fix.patch
@@ -0,0 +1,15 @@
+Origin: Debian 4.5.15-1.1 diff
+
+--- strace-4.5.15.orig/configure.ac
++++ strace-4.5.15/configure.ac
+@@ -194,7 +194,9 @@
+ AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname)
+ AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h inttypes.h], [], [])
+ AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
+-                 [], [], [#include <linux/socket.h>])
++                 [], [], 
++[#include <stddef.h>
++#include <linux/socket.h>])
+ AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
+ AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
+ 
diff --git a/meta/packages/strace/strace_4.5.15.bb b/meta/packages/strace/strace_4.5.15.bb
index 5eee1b38b7..10f705a683 100644
--- a/meta/packages/strace/strace_4.5.15.bb
+++ b/meta/packages/strace/strace_4.5.15.bb
@@ -1,10 +1,12 @@
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
            file://strace-fix-arm-bad-syscall.patch;patch=1 \
-           file://strace-undef-syscall.patch;patch=1"
+           file://strace-undef-syscall.patch;patch=1 \
+           file://linux-headers-fix.patch;patch=1"
 # TODO file://sh-arch-update.patch;patch=1 \
 # TODO file://sh-syscall-update.patch;patch=1 \