patches/glibc/ports-2.10.1/300-nscd-one-fork.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu Oct 07 22:37:06 2010 +0200 (2010-10-07)
changeset 2138 2242d87c5404
permissions -rw-r--r--
scripts: always create lib32 and lib64 symlinks

Unconditionally create the lib32 -> lib/ and lib64 -> lib/ symlinks.

This is reportedly a fix to build a toolchain for a 32-bit target on
a 'pure' 64-bit host (eg. on Fedora FC12, host libs are in lib64/,
and there is no lib -> lib64 symlink, as we can see on other distors,
as Debian). As gcc only puts static host lib in lib64/ (along with
target files in subdirs), we can safely create the symlinks.

Also note that the symlinks are summarily removed at the end
of the build.

Signed-off-by: Anthony Foiani <anthony.foiani@gmail.com>
[Yann E. MORIN: fix a comment, rephrase the commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1625
     1
only fork one to assist in stop-start-daemon assumptions about daemon behavior
yann@1625
     2
yann@1625
     3
http://bugs.gentoo.org/190785
yann@1625
     4
yann@1625
     5
diff -durN glibc-2.10.1.orig/nscd/nscd.c glibc-2.10.1/nscd/nscd.c
yann@1625
     6
--- glibc-2.10.1.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
yann@1625
     7
+++ glibc-2.10.1/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
yann@1625
     8
@@ -182,6 +182,9 @@
yann@1625
     9
       if (pid != 0)
yann@1625
    10
 	exit (0);
yann@1625
    11
 
yann@1625
    12
+       if (write_pid (_PATH_NSCDPID) < 0)
yann@1625
    13
+	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
yann@1625
    14
+
yann@1625
    15
       int nullfd = open (_PATH_DEVNULL, O_RDWR);
yann@1625
    16
       if (nullfd != -1)
yann@1625
    17
 	{
yann@1625
    18
@@ -231,12 +234,6 @@
yann@1625
    19
 	for (i = min_close_fd; i < getdtablesize (); i++)
yann@1625
    20
 	  close (i);
yann@1625
    21
 
yann@1625
    22
-      pid = fork ();
yann@1625
    23
-      if (pid == -1)
yann@1625
    24
-	error (EXIT_FAILURE, errno, _("cannot fork"));
yann@1625
    25
-      if (pid != 0)
yann@1625
    26
-	exit (0);
yann@1625
    27
-
yann@1625
    28
       setsid ();
yann@1625
    29
 
yann@1625
    30
       if (chdir ("/") != 0)
yann@1625
    31
@@ -245,9 +242,6 @@
yann@1625
    32
 
yann@1625
    33
       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
yann@1625
    34
 
yann@1625
    35
-      if (write_pid (_PATH_NSCDPID) < 0)
yann@1625
    36
-        dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
yann@1625
    37
-
yann@1625
    38
       if (!init_logfile ())
yann@1625
    39
 	dbg_log (_("Could not create log file"));
yann@1625
    40