patches/glibc/ports-2.12.1/300-nscd-one-fork.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)
     1 only fork one to assist in stop-start-daemon assumptions about daemon behavior
     2 
     3 http://bugs.gentoo.org/190785
     4 
     5 diff -durN glibc-2.12.1.orig/nscd/nscd.c glibc-2.12.1/nscd/nscd.c
     6 --- glibc-2.12.1.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
     7 +++ glibc-2.12.1/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
     8 @@ -182,6 +182,9 @@
     9        if (pid != 0)
    10  	exit (0);
    11  
    12 +       if (write_pid (_PATH_NSCDPID) < 0)
    13 +	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
    14 +
    15        int nullfd = open (_PATH_DEVNULL, O_RDWR);
    16        if (nullfd != -1)
    17  	{
    18 @@ -231,12 +234,6 @@
    19  	for (i = min_close_fd; i < getdtablesize (); i++)
    20  	  close (i);
    21  
    22 -      pid = fork ();
    23 -      if (pid == -1)
    24 -	error (EXIT_FAILURE, errno, _("cannot fork"));
    25 -      if (pid != 0)
    26 -	exit (0);
    27 -
    28        setsid ();
    29  
    30        if (chdir ("/") != 0)
    31 @@ -245,9 +242,6 @@
    32  
    33        openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
    34  
    35 -      if (write_pid (_PATH_NSCDPID) < 0)
    36 -	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
    37 -
    38        if (!init_logfile ())
    39  	dbg_log (_("Could not create log file"));
    40