Author: viric Date: Fri Oct 15 17:56:01 2010 New Revision: 24305 URL: https://svn.nixos.org/websvn/nix/?rev=24305&sc=1
Log: Trying to fix the nscd ssp problem finally. http://sources.redhat.com/bugzilla/show_bug.cgi?id=12125 I also reported this upstream, as it seems broken since 2.11.1 Added: 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/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 Fri Oct 15 17:27:54 2010 (r24304) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix Fri Oct 15 17:56:01 2010 (r24305) @@ -74,6 +74,9 @@ /* Allow nixos and nix handle the locale-archive. */ ./nix-locale-archive.patch + + /* Allow nixos and nix handle the locale-archive. */ + ./nscd-ssp-linking.patch ]; postPatch = '' @@ -83,9 +86,7 @@ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. - # It also needs -lssp when building with nixpkgs gcc (not of - # boostrap-tools) - echo "LDFLAGS-nscd += -static-libgcc -lssp" >> nscd/Makefile + echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile ''; configureFlags = [ Added: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nscd-ssp-linking.patch Fri Oct 15 17:56:01 2010 (r24305) @@ -0,0 +1,16 @@ +http://sources.redhat.com/bugzilla/show_bug.cgi?id=12125 + +diff --git a/nscd/Makefile b/nscd/Makefile +index 93874e5..63f7144 100644 +--- a/nscd/Makefile ++++ b/nscd/Makefile +@@ -90,6 +90,9 @@ CFLAGS-nscd_initgroups.c = -fexceptions + nscd-cflags = -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2 + ifeq (yesyes,$(have-fpie)$(build-shared)) + nscd-cflags += $(pie-ccflag) ++ifeq (yes,$(have-ssp)) ++LDFLAGS-nscd += -lssp_noshared -lssp ++endif + endif + ifeq (yes,$(have-ssp)) + nscd-cflags += -fstack-protector _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
