Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.5.19/150-undef-syscall.patch
author Joachim Nilsson <jocke@vmlinux.org>
Fri Jan 01 12:17:39 2010 +0100 (2010-01-01)
changeset 1671 08a5129e6eb0
permissions -rw-r--r--
debug/strace: fix strace 4.5.19 to properly build with latest Linux kernels

Here's a couple of patches to get strace 4.5.19 to configure and build
properly with the latest kernel headers. Not pretty, but hopefully
enough while we wait for 4.5.20 to be released.

With the current strace-4.5.19 patches I failed to get the configure
script running even on my host environment. Also, when cross building
the configure script needs to look for the proper system headers to be
able to properly set HAVE_LINUX_NETLINK_H. Otherwise you get:

[EXTRA] Building strace
[ERROR] /home/jocke/x-tools/targets/src/strace-4.5.19/net.c:976:
error: field 'nl' has incomplete type
[ERROR] make[2]: *** [net.o] Error 1
[ERROR] make[1]: *** [all] Error 2

The fix was simple, backport a change set from the git[1] tree and run
autoreconf to update the configure script.

[1] - http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commit;h=f0df31e71a58c6e79ba77c1a9d84b2f38d44bec7 
     1 diff -durN strace-4.5.19.orig/linux/syscallent.h strace-4.5.19/linux/syscallent.h

     2 --- strace-4.5.19.orig/linux/syscallent.h	2009-09-01 21:53:29.000000000 +0200

     3 +++ strace-4.5.19/linux/syscallent.h	2009-10-28 18:47:18.000000000 +0100

     4 @@ -130,7 +130,11 @@

     5  	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */

     6  	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */

     7  	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */

     8 -	{ 2,	TD,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */

     9 +	{ 2,	TD,	sys_socketcall,		"socketcall"

    10 +#ifdef __NR_socketcall

    11 +	    , SYS_socketcall

    12 +#endif

    13 +								}, /* 102 */

    14  	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */

    15  	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */

    16  	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */

    17 @@ -145,7 +149,11 @@

    18  	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */

    19  	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */

    20  	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */

    21 -	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */

    22 +	{ 6,	0,	sys_ipc,		"ipc"

    23 +#ifdef __NR_ipc

    24 +	    , SYS_ipc

    25 +#endif

    26 +								}, /* 117 */

    27  	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */

    28  	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */

    29  	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */

    30 @@ -282,7 +290,11 @@

    31  	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */

    32  	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 250 */

    33  	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */

    34 -	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */

    35 +	{ 1,	TP,	sys_exit,		"exit_group"

    36 +#ifdef __NR_exit_group

    37 +	    , __NR_exit_group

    38 +#endif

    39 +								}, /* 252 */

    40  	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */

    41  	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */

    42  	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
crosstool-ng