patches/glibc/ports-2.13/420-alpha-statfs.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@2438
     1
2011-02-28  Aurelien Jarno  <aurelien@aurel32.net>
yann@2438
     2
yann@2438
     3
	* sysdeps/unix/sysv/linux/mips/bits/statfs.h (struct statfs,
yann@2438
     4
	struct statfs64): Add f_flags field.
yann@2438
     5
yann@2438
     6
diff --git glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
yann@2438
     7
index d838e6b..157591d 100644
yann@2438
     8
--- glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
yann@2438
     9
+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
yann@2438
    10
@@ -42,7 +42,8 @@ struct statfs
yann@2438
    11
     __fsid_t f_fsid;
yann@2438
    12
     int f_namelen;
yann@2438
    13
     int f_frsize;
yann@2438
    14
-    int f_spare[5];
yann@2438
    15
+    int f_flags;
yann@2438
    16
+    int f_spare[4];
yann@2438
    17
   };
yann@2438
    18
 
yann@2438
    19
 #ifdef __USE_LARGEFILE64
yann@2438
    20
@@ -58,7 +59,8 @@ struct statfs64
yann@2438
    21
     __fsid_t f_fsid;
yann@2438
    22
     int f_namelen;
yann@2438
    23
     int f_frsize;
yann@2438
    24
-    int f_spare[5];
yann@2438
    25
+    int f_flags;
yann@2438
    26
+    int f_spare[4];
yann@2438
    27
   };
yann@2438
    28
 #endif
yann@2438
    29