annotate sources/patches/strace-fixnet.patch @ 950:a43d74908821

The 2.6.32 kernel headers broke the strace build, this fixes it.
author Rob Landley <rob@landley.net>
date Tue, 12 Jan 2010 21:58:11 -0600
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
950
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 The linux/socket.h header was lobotomized in Linux 2.6.32 by
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
2 Ben Hutchings in git 9c501935a3cd (for no readily apparent reason).
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
3
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
4 diff -ru strace/configure strace2/configure
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
5 --- strace/configure 2008-08-28 16:36:06.000000000 -0500
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
6 +++ strace2/configure 2010-01-12 21:26:44.000000000 -0600
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
7 @@ -7580,7 +7580,7 @@
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
8 cat >>conftest.$ac_ext <<_ACEOF
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
9 /* end confdefs.h. */
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
10 #include <stddef.h>
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
11 -#include <linux/socket.h>
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
12 +#include <sys/socket.h>
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
13
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
14 #include <$ac_header>
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
15 _ACEOF
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
16 diff -ru strace/configure.ac strace2/configure.ac
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
17 --- strace/configure.ac 2008-08-28 16:15:56.000000000 -0500
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
18 +++ strace2/configure.ac 2010-01-12 21:26:28.000000000 -0600
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
19 @@ -196,7 +196,7 @@
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
20 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], [], [])
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
21 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
22 [], [], [#include <stddef.h>
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
23 -#include <linux/socket.h>])
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
24 +#include <sys/socket.h>])
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
25 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
26 AC_CHECK_TYPES([struct sigcontext_struct],,, [#include <signal.h>])
a43d74908821 The 2.6.32 kernel headers broke the strace build, this fixes it.
Rob Landley <rob@landley.net>
parents:
diff changeset
27 AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])