patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.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/syscall.c strace-4.5.16/syscall.c
yann@951
     2
--- strace-4.5.16.orig/syscall.c	2007-07-14 19:21:44.000000000 +0200
yann@951
     3
+++ strace-4.5.16/syscall.c	2007-07-14 19:22:49.000000000 +0200
yann@951
     4
@@ -125,6 +125,18 @@
yann@951
     5
 #define TP TRACE_PROCESS
yann@951
     6
 #define TS TRACE_SIGNAL
yann@951
     7
yann@951
     8
+#ifndef HAVE_STATFS64
yann@951
     9
+/*
yann@951
    10
+ * Ugly hacks for systems that do not have LFS
yann@951
    11
+ */
yann@951
    12
+
yann@951
    13
+#define sys_truncate64  sys_truncate
yann@951
    14
+#define sys_ftruncate64 sys_ftruncate
yann@951
    15
+#define sys_getdents64  sys_getdents
yann@951
    16
+#define sys_statfs64    sys_statfs
yann@951
    17
+#define sys_fstatfs64   sys_fstatfs
yann@951
    18
+#endif
yann@951
    19
+
yann@951
    20
 static const struct sysent sysent0[] = {
yann@951
    21
 #include "syscallent.h"
yann@951
    22
 };