[oe] [PATCH v2] strace: add patch allowing compilation with kernel headers >= 2.6.32

[Tom Rini]

On 01/13/2011 06:45 AM, Eric Bénard wrote:
> tested with kernel headers 2.6.31&  2.6.37 : both compile fine.
>
> Signed-off-by: Eric Bénard<eric at eukrea.com>

I still say (and on top of my last, just sent email) that we basically 
only need strace 4.5.14 for avr32 and everyone else should be fine with 
4.5.20.

> ---
> v2 : with the patch this time ;-)
>
>   .../strace/strace-4.5.14/strace-linux-2.6.32.patch |   13 +++++++++++++
>   recipes/strace/strace_4.5.14.bb                    |    3 ++-
>   2 files changed, 15 insertions(+), 1 deletions(-)
>   create mode 100644 recipes/strace/strace-4.5.14/strace-linux-2.6.32.patch
>
> diff --git a/recipes/strace/strace-4.5.14/strace-linux-2.6.32.patch b/recipes/strace/strace-4.5.14/strace-linux-2.6.32.patch
> new file mode 100644
> index 0000000..cb0ffbf
> --- /dev/null
> +++ b/recipes/strace/strace-4.5.14/strace-linux-2.6.32.patch
> @@ -0,0 +1,13 @@
> +diff --git a/configure.ac b/configure.ac
> +index 03069c0..7a134bd 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -194,7 +194,7 @@ fi
> + 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], [], [])
> + AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
> +-                 [], [], [#include<linux/socket.h>])
> ++                 [], [], [#include<sys/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/recipes/strace/strace_4.5.14.bb b/recipes/strace/strace_4.5.14.bb
> index 33a44ad..395e4ee 100644
> --- a/recipes/strace/strace_4.5.14.bb
> +++ b/recipes/strace/strace_4.5.14.bb
> @@ -1,7 +1,7 @@
>   DESCRIPTION = "strace is a system call tracing tool."
>   SECTION = "console/utils"
>   LICENSE = "BSD"
> -PR = "r9"
> +PR = "r10"
>
>   SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
>              file://glibc-2.5.patch \
> @@ -13,6 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
>              file://strace-arm-no-cachectl.patch \
>              file://strace-dont-include-linux-dirent-h.patch \
>              file://mips-sigcontext.patch \
> +           file://strace-linux-2.6.32.patch \
>             "
>
>   # The strace-4.5.14-avr32.patch conflicts with some other patches.


-- 
Tom Rini
Mentor Graphics Corporation