summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-10-14 20:55:58 +0000
committerUlrich Drepper <drepper@redhat.com>2004-10-14 20:55:58 +0000
commit59350982d0048bb18711b4c2ef32de738772bb76 (patch)
tree803d53804a0aee0020d3f129868e8af434794957
parent5ca3d19c74195e45f48d83b24b10bac55fa078a4 (diff)
downloadglibc-59350982d0048bb18711b4c2ef32de738772bb76.tar.gz
Update.
* nscd/Makefile: When using compilers without -fpie support, also link with -lselinux if necessary. Patch by Arkadiusz Miskiewicz <arekm@pld-linux.org>.
-rw-r--r--ChangeLog4
-rw-r--r--nscd/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fa15952df0..5096e32608 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-10-14 Ulrich Drepper <drepper@redhat.com>
+ * nscd/Makefile: When using compilers without -fpie support, also
+ link with -lselinux if necessary.
+ Patch by Arkadiusz Miskiewicz <arekm@pld-linux.org>.
+
* nscd/connections.c (nscd_init): Remove file if not persistent
and not shared. Patch by Jerome Borsboom <j.borsboom@erasmusmc.nl>.
diff --git a/nscd/Makefile b/nscd/Makefile
index 70a35198c2..b21edc2b79 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -123,10 +123,10 @@ $(objpfx)nscd_nischeck: $(objpfx)nscd_nischeck.o
ifeq ($(build-shared),yes)
$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) \
- $(common-objpfx)nis/libnsl.so
+ $(common-objpfx)nis/libnsl.so $(selinux-LIBS)
$(objpfx)nscd_nischeck: $(common-objpfx)nis/libnsl.so
else
$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) \
- $(common-objpfx)nis/libnsl.a
+ $(common-objpfx)nis/libnsl.a $(selinux-LIBS)
$(objpfx)nscd_nischeck: $(common-objpfx)nis/libnsl.a
endif