Mercurial > hg > aboriginal
changeset 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 | 1d6155f9be9f |
| children | e6fd6f4fe67d |
| files | sources/patches/strace-fixnet.patch |
| diffstat | 1 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/patches/strace-fixnet.patch Tue Jan 12 21:58:11 2010 -0600 @@ -0,0 +1,27 @@ +The linux/socket.h header was lobotomized in Linux 2.6.32 by +Ben Hutchings in git 9c501935a3cd (for no readily apparent reason). + +diff -ru strace/configure strace2/configure +--- strace/configure 2008-08-28 16:36:06.000000000 -0500 ++++ strace2/configure 2010-01-12 21:26:44.000000000 -0600 +@@ -7580,7 +7580,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <stddef.h> +-#include <linux/socket.h> ++#include <sys/socket.h> + + #include <$ac_header> + _ACEOF +diff -ru strace/configure.ac strace2/configure.ac +--- strace/configure.ac 2008-08-28 16:15:56.000000000 -0500 ++++ strace2/configure.ac 2010-01-12 21:26:28.000000000 -0600 +@@ -196,7 +196,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], [], []) + AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], + [], [], [#include <stddef.h> +-#include <linux/socket.h>]) ++#include <sys/socket.h>]) + AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) + AC_CHECK_TYPES([struct sigcontext_struct],,, [#include <signal.h>]) + AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])