Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.5.18/160-undef-syscall.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
yann@951 
     1
 
diff -dur strace-4.5.16.orig/linux/syscallent.h strace-4.5.16/linux/syscallent.h
yann@951 
     2
 
--- strace-4.5.16.orig/linux/syscallent.h	2006-10-16 03:17:52.000000000 +0200
yann@951 
     3
 
+++ strace-4.5.16/linux/syscallent.h	2007-07-14 19:30:16.000000000 +0200
yann@951 
     4
 
@@ -130,7 +130,11 @@
yann@951 
     5
 
 	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
yann@951 
     6
 
 	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
yann@951 
     7
 
 	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
yann@951 
     8
 
-	{ 2,	TD,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
yann@951 
     9
 
+	{ 2,	TD,	sys_socketcall,		"socketcall"
yann@951 
    10
 
+#ifdef __NR_socketcall
yann@951 
    11
 
+	    , SYS_socketcall
yann@951 
    12
 
+#endif
yann@951 
    13
 
+								}, /* 102 */
yann@951 
    14
 
 	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
yann@951 
    15
 
 	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
yann@951 
    16
 
 	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
yann@951 
    17
 
@@ -145,7 +149,11 @@
yann@951 
    18
 
 	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
yann@951 
    19
 
 	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
yann@951 
    20
 
 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
yann@951 
    21
 
-	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
yann@951 
    22
 
+	{ 6,	0,	sys_ipc,		"ipc"
yann@951 
    23
 
+#ifdef __NR_ipc
yann@951 
    24
 
+	    , SYS_ipc
yann@951 
    25
 
+#endif
yann@951 
    26
 
+								}, /* 117 */
yann@951 
    27
 
 	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
yann@951 
    28
 
 	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
yann@951 
    29
 
 	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
yann@951 
    30
 
@@ -282,7 +290,11 @@
yann@951 
    31
 
 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
yann@951 
    32
 
 	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 250 */
yann@951 
    33
 
 	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
yann@951 
    34
 
-	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
yann@951 
    35
 
+	{ 1,	TP,	sys_exit,		"exit_group"
yann@951 
    36
 
+#ifdef __NR_exit_group
yann@951 
    37
 
+	    , __NR_exit_group
yann@951 
    38
 
+#endif
yann@951 
    39
 
+								}, /* 252 */
yann@951 
    40
 
 	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
yann@951 
    41
 
 	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
yann@951 
    42
 
 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
crosstool-ng