diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-06 08:28:18 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-06 08:28:18 +0000 |
| commit | c347eaac5b1e8e8321e39087fbd76f1467df20d8 (patch) | |
| tree | 322674226a262f72775a66bbab373b8033555477 /meta | |
| parent | 89fdbffb0a622595f306c9d1a8d3144f2fc6df4a (diff) | |
| download | poky-c347eaac5b1e8e8321e39087fbd76f1467df20d8.tar.gz | |
strace: unbreak - patch from Debian
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3957 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/strace/strace/linux-headers-fix.patch | 15 | ||||
| -rw-r--r-- | meta/packages/strace/strace_4.5.15.bb | 4 |
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 @@ | |||
| 1 | Origin: Debian 4.5.15-1.1 diff | ||
| 2 | |||
| 3 | --- strace-4.5.15.orig/configure.ac | ||
| 4 | +++ strace-4.5.15/configure.ac | ||
| 5 | @@ -194,7 +194,9 @@ | ||
| 6 | AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname) | ||
| 7 | 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], [], []) | ||
| 8 | AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], | ||
| 9 | - [], [], [#include <linux/socket.h>]) | ||
| 10 | + [], [], | ||
| 11 | +[#include <stddef.h> | ||
| 12 | +#include <linux/socket.h>]) | ||
| 13 | AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) | ||
| 14 | AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>]) | ||
| 15 | |||
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 @@ | |||
| 1 | DESCRIPTION = "strace is a system call tracing tool." | 1 | DESCRIPTION = "strace is a system call tracing tool." |
| 2 | SECTION = "console/utils" | 2 | SECTION = "console/utils" |
| 3 | LICENSE = "GPL" | 3 | LICENSE = "GPL" |
| 4 | PR = "r1" | ||
| 4 | 5 | ||
| 5 | SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ | 6 | SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ |
| 6 | file://strace-fix-arm-bad-syscall.patch;patch=1 \ | 7 | file://strace-fix-arm-bad-syscall.patch;patch=1 \ |
| 7 | file://strace-undef-syscall.patch;patch=1" | 8 | file://strace-undef-syscall.patch;patch=1 \ |
| 9 | file://linux-headers-fix.patch;patch=1" | ||
| 8 | # TODO file://sh-arch-update.patch;patch=1 \ | 10 | # TODO file://sh-arch-update.patch;patch=1 \ |
| 9 | # TODO file://sh-syscall-update.patch;patch=1 \ | 11 | # TODO file://sh-syscall-update.patch;patch=1 \ |
| 10 | 12 | ||