Mercurial > hg > aboriginal
comparison 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 |
comparison
equal
deleted
inserted
replaced
949:1d6155f9be9f | 950:a43d74908821 |
---|---|
1 The linux/socket.h header was lobotomized in Linux 2.6.32 by | |
2 Ben Hutchings in git 9c501935a3cd (for no readily apparent reason). | |
3 | |
4 diff -ru strace/configure strace2/configure | |
5 --- strace/configure 2008-08-28 16:36:06.000000000 -0500 | |
6 +++ strace2/configure 2010-01-12 21:26:44.000000000 -0600 | |
7 @@ -7580,7 +7580,7 @@ | |
8 cat >>conftest.$ac_ext <<_ACEOF | |
9 /* end confdefs.h. */ | |
10 #include <stddef.h> | |
11 -#include <linux/socket.h> | |
12 +#include <sys/socket.h> | |
13 | |
14 #include <$ac_header> | |
15 _ACEOF | |
16 diff -ru strace/configure.ac strace2/configure.ac | |
17 --- strace/configure.ac 2008-08-28 16:15:56.000000000 -0500 | |
18 +++ strace2/configure.ac 2010-01-12 21:26:28.000000000 -0600 | |
19 @@ -196,7 +196,7 @@ | |
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], [], []) | |
21 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], | |
22 [], [], [#include <stddef.h> | |
23 -#include <linux/socket.h>]) | |
24 +#include <sys/socket.h>]) | |
25 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) | |
26 AC_CHECK_TYPES([struct sigcontext_struct],,, [#include <signal.h>]) | |
27 AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>]) |