Author: viric
Date: Thu Oct  7 21:59:31 2010
New Revision: 24157
URL: https://svn.nixos.org/websvn/nix/?rev=24157&sc=1

Log:
Fixing nscd in glibc (thank you Ludovic!).

Modified:
   
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
==============================================================================
--- 
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
    Thu Oct  7 21:23:09 2010        (r24156)
+++ 
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
    Thu Oct  7 21:59:31 2010        (r24157)
@@ -76,10 +76,14 @@
     ./nix-locale-archive.patch
   ];
 
-  # Needed for glibc to build with the gnumake 3.82
-  # http://comments.gmane.org/gmane.linux.lfs.support/31227
   postPatch = ''
+    # Needed for glibc to build with the gnumake 3.82
+    # http://comments.gmane.org/gmane.linux.lfs.support/31227
     sed -i 's/ot \$/ot:\n\ttouch $...@\n$/' manual/Makefile
+
+    # nscd needs libgcc, and we don't want it dynamically linked
+    # because we don't want it to depend on bootstrap-tools libs.
+    echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile
   '';
 
   configureFlags = [
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to