Author: viric
Date: Fri Oct 15 22:58:12 2010
New Revision: 24313
URL: https://svn.nixos.org/websvn/nix/?rev=24313&sc=1
Log:
Fixing the nscd patch again. The other attempts did not give a working nscd.
The build system was making a nscd dynamically linked with libssp, which we
don't want in general. We want a glibc not depending on the gcc that built it.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch
Fri Oct 15 22:49:55 2010 (r24312)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch
Fri Oct 15 22:58:12 2010 (r24313)
@@ -9,7 +9,7 @@
ifeq (yesyes,$(have-fpie)$(build-shared))
nscd-cflags += $(pie-ccflag)
+ifeq (yes,$(have-ssp))
-+LDFLAGS-nscd += -lssp_nonshared -lssp
++link-extra-libs += -Wl,-Bstatic -lssp -Wl,-Bdynamic
+endif
endif
ifeq (yes,$(have-ssp))
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
