From 955fe6f69d3cba0fd9e628190f51face166ceec5 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 15 Oct 2010 22:58:12 +0000 Subject: 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. svn path=/nixpkgs/branches/stdenv-updates/; revision=24313 --- pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch b/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch index 84d1064f6acc..2e47cee348ed 100644 --- a/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch +++ b/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch @@ -9,7 +9,7 @@ index 93874e5..63f7144 100644 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)) -- cgit 1.4.1