Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.1/200-pr24170.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
parent 746 b150d6f590fc
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) 
     1 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch

     2 http://gcc.gnu.org/PR24170

     3 

     4 2008-02-20  Tom Tromey  <tromey@redhat.com>

     5 

     6 	PR libgcj/24170:

     7 	* java/io/natFilePosix.cc (File::performList): Don't use

     8 	readdir_r.

     9 	* configure, include/config.h.in: Rebuilt.

    10 	* configure.ac: Don't check for readdir_r.

    11 

    12 diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac

    13 --- gcc-4.3.1.orig/libjava/configure.ac	2008-06-10 14:57:42.000000000 +0200

    14 +++ gcc-4.3.1/libjava/configure.ac	2008-06-10 14:58:13.000000000 +0200

    15 @@ -1030,7 +1030,7 @@

    16     PLATFORMNET=NoNet

    17  else

    18     AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \

    19 -                   localtime_r readdir_r getpwuid_r getcwd \

    20 +                   localtime_r getpwuid_r getcwd \

    21  		   access stat lstat mkdir rename rmdir unlink utime chmod readlink \

    22  		   nl_langinfo setlocale \

    23  		   inet_pton uname inet_ntoa \

    24 diff -durN gcc-4.3.1.orig/libjava/include/config.h.in gcc-4.3.1/libjava/include/config.h.in

    25 --- gcc-4.3.1.orig/libjava/include/config.h.in	2007-07-31 18:17:21.000000000 +0200

    26 +++ gcc-4.3.1/libjava/include/config.h.in	2008-06-10 14:58:13.000000000 +0200

    27 @@ -214,9 +214,6 @@

    28  /* Define to 1 if you have the <pwd.h> header file. */

    29  #undef HAVE_PWD_H

    30  

    31 -/* Define to 1 if you have the `readdir_r' function. */

    32 -#undef HAVE_READDIR_R

    33 -

    34  /* Define to 1 if you have the `readlink' function. */

    35  #undef HAVE_READLINK

    36  

    37 diff -durN gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc gcc-4.3.1/libjava/java/io/natFilePosix.cc

    38 --- gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc	2007-08-04 23:50:01.000000000 +0200

    39 +++ gcc-4.3.1/libjava/java/io/natFilePosix.cc	2008-06-10 14:58:13.000000000 +0200

    40 @@ -1,6 +1,6 @@

    41  // natFile.cc - Native part of File class for POSIX.

    42  

    43 -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006

    44 +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008

    45     Free Software Foundation

    46  

    47     This file is part of libgcj.

    48 @@ -292,13 +292,7 @@

    49  

    50    java::util::ArrayList *list = new java::util::ArrayList ();

    51    struct dirent *d;

    52 -#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)

    53 -  int name_max = pathconf (buf, _PC_NAME_MAX);

    54 -  char dbuf[sizeof (struct dirent) + name_max + 1];

    55 -  while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)

    56 -#else /* HAVE_READDIR_R */

    57    while ((d = readdir (dir)) != NULL)

    58 -#endif /* HAVE_READDIR_R */

    59      {

    60        // Omit "." and "..".

    61        if (d->d_name[0] == '.'
crosstool-ng