]>
Commit | Line | Data |
---|---|---|
4d4977a4 JB |
1 | =================================================================== |
2 | RCS file: /cvs/glibc/libc/nscd/Makefile,v | |
3 | retrieving revision 1.40 | |
4 | retrieving revision 1.41 | |
5 | diff -u -r1.40 -r1.41 | |
6 | --- libc/nscd/Makefile 2004/12/16 22:21:24 1.40 | |
7 | +++ libc/nscd/Makefile 2005/01/18 01:21:35 1.41 | |
8 | @@ -1,4 +1,4 @@ | |
9 | -# Copyright (C) 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. | |
10 | +# Copyright (C) 1998,2000,2002,2003,2004,2005 Free Software Foundation, Inc. | |
11 | # This file is part of the GNU C Library. | |
12 | ||
13 | # The GNU C Library is free software; you can redistribute it and/or | |
14 | @@ -56,6 +56,8 @@ | |
15 | selinux-LIBS := -lselinux | |
16 | endif | |
17 | ||
18 | +LDLIBS-nscd = $(selinux-LIBS) | |
19 | + | |
20 | distribute := nscd.h nscd-client.h dbg_log.h \ | |
21 | $(addsuffix .c, $(filter-out xmalloc, $(nscd-modules))) \ | |
22 | nscd_nischeck.c nscd.conf nscd.init nscd_proto.h \ | |
23 | @@ -110,7 +112,7 @@ | |
24 | $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ | |
25 | $(LDFLAGS) $(LDFLAGS-$(@F)) \ | |
26 | -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \ | |
27 | - -o $@ $^ $(selinux-LIBS) $(common-objpfx)libc_nonshared.a | |
28 | + -o $@ $^ $(LDLIBS-nscd) $(common-objpfx)libc_nonshared.a | |
29 | endif | |
30 | ||
31 | # This makes sure -DNOT_IN_libc is passed for all these modules. | |
32 | --- glibc-2.3.4/nscd/Makefile.orig 2005-01-27 14:19:09.000000000 +0100 | |
33 | +++ glibc-2.3.4/nscd/Makefile 2005-01-27 15:25:00.000000000 +0100 | |
34 | @@ -125,10 +125,10 @@ | |
35 | ||
36 | ifeq ($(build-shared),yes) | |
37 | $(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) \ | |
38 | - $(common-objpfx)nis/libnsl.so | |
39 | + $(common-objpfx)nis/libnsl.so $(LDLIBS-nscd) | |
40 | $(objpfx)nscd_nischeck: $(common-objpfx)nis/libnsl.so | |
41 | else | |
42 | $(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) \ | |
43 | - $(common-objpfx)nis/libnsl.a | |
44 | + $(common-objpfx)nis/libnsl.a $(LDLIBS-nscd) | |
45 | $(objpfx)nscd_nischeck: $(common-objpfx)nis/libnsl.a | |
46 | endif |