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
This commit is contained in:
parent
fca582bff0
commit
180cb34e2a
@ -69,9 +69,6 @@ stdenv.mkDerivation ({
|
|||||||
/* Have rpcgen(1) look for cpp(1) in $PATH. */
|
/* Have rpcgen(1) look for cpp(1) in $PATH. */
|
||||||
./rpcgen-path.patch
|
./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 */
|
/* Fix for the check of -fgnu89-inline compiler flag */
|
||||||
./gnu89-inline.patch
|
./gnu89-inline.patch
|
||||||
|
|
||||||
|
@ -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
|
|
Loading…
Reference in New Issue
Block a user