From 180cb34e2ab692bfa3c5be2a96b29d67f7acdba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 7 Oct 2010 21:23:09 +0000 Subject: [PATCH] Removing a glibc patch for nscd I think we don't need anymore in the main glibc expression. For what I could see from the build log, although it should add a '-lssp', it did not have any effect in this glibc 2.12. svn path=/nixpkgs/branches/stdenv-updates/; revision=24156 --- pkgs/development/libraries/glibc-2.12/common.nix | 3 --- .../libraries/glibc-2.12/stack-protector-link.patch | 12 ------------ 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/glibc-2.12/stack-protector-link.patch diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index af36787139bf..8786f8895ab1 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.12/common.nix @@ -69,9 +69,6 @@ stdenv.mkDerivation ({ /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch - /* Make sure `nscd' et al. are linked against `libssp'. */ - ./stack-protector-link.patch - /* Fix for the check of -fgnu89-inline compiler flag */ ./gnu89-inline.patch diff --git a/pkgs/development/libraries/glibc-2.12/stack-protector-link.patch b/pkgs/development/libraries/glibc-2.12/stack-protector-link.patch deleted file mode 100644 index d200ece52df7..000000000000 --- a/pkgs/development/libraries/glibc-2.12/stack-protector-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -Make sure `nscd' et al. are linked against `libssp'. - ---- glibc-2.11/nscd/Makefile 2009-10-30 18:17:08.000000000 +0100 -+++ glibc-2.11/nscd/Makefile 2009-11-22 01:19:37.000000000 +0100 -@@ -126,6 +126,7 @@ CFLAGS-res_hconf.c += $(nscd-cflags) - ifeq (yesyes,$(have-fpie)$(build-shared)) - relro-LDFLAGS += -Wl,-z,now - -+$(objpfx)nscd: LDFLAGS += -lssp - $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) - $(+link-pie) - endif