diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-15 22:58:12 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-15 22:58:12 +0000 |
| commit | 955fe6f69d3cba0fd9e628190f51face166ceec5 (patch) | |
| tree | 5c280b455c761faa2fcaf475d8380c4d4b34cc54 /pkgs | |
| parent | d5f6182edc8ae8285193dec2267beaffec573b9d (diff) | |
| download | nixlib-955fe6f69d3cba0fd9e628190f51face166ceec5.tar nixlib-955fe6f69d3cba0fd9e628190f51face166ceec5.tar.gz nixlib-955fe6f69d3cba0fd9e628190f51face166ceec5.tar.bz2 nixlib-955fe6f69d3cba0fd9e628190f51face166ceec5.tar.lz nixlib-955fe6f69d3cba0fd9e628190f51face166ceec5.tar.xz nixlib-955fe6f69d3cba0fd9e628190f51face166ceec5.tar.zst nixlib-955fe6f69d3cba0fd9e628190f51face166ceec5.zip | |
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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |