5059ab35f3
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1552 6952d904-891a-0410-993b-d76249ca496b
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
PIE support is broken on PARISC in this glibc so make sure we dont force
|
|
building nscd as a PIE or bad things happen.
|
|
|
|
--- nscd/Makefile
|
|
+++ nscd/Makefile
|
|
@@ -35,7 +35,7 @@
|
|
ifeq ($(have-thread-library),yes)
|
|
|
|
others := nscd_nischeck
|
|
-ifneq (yesyes,$(have-fpie)$(build-shared))
|
|
+ifneq (yes,$(build-shared))
|
|
others += nscd
|
|
endif
|
|
install-sbin := nscd nscd_nischeck
|
|
@@ -60,27 +60,10 @@
|
|
CFLAGS-nscd_getgr_r.c = -fexceptions
|
|
CFLAGS-nscd_gethst_r.c = -fexceptions
|
|
|
|
-ifeq (yesyes,$(have-fpie)$(build-shared))
|
|
-CFLAGS-nscd.c = -fpie
|
|
-CFLAGS-connections.c = -fpie
|
|
-CFLAGS-pwdcache.c = -fpie
|
|
-CFLAGS-getpwnam_r.c = -fpie
|
|
-CFLAGS-getpwuid_r.c = -fpie
|
|
-CFLAGS-grpcache.c = -fpie
|
|
-CFLAGS-getgrnam_r.c = -fpie
|
|
-CFLAGS-getgrgid_r.c = -fpie
|
|
-CFLAGS-hstcache.c = -fpie
|
|
-CFLAGS-gethstbyad_r.c = -fpie
|
|
-CFLAGS-gethstbynm2_r.c = -fpie
|
|
-CFLAGS-dbg_log.c = -fpie
|
|
-CFLAGS-nscd_conf.c = -fpie
|
|
-CFLAGS-nscd_stat.c = -fpie
|
|
-CFLAGS-cache.c = -fpie
|
|
-CFLAGS-xmalloc.c = -fpie
|
|
-CFLAGS-xstrdup.c = -fpie
|
|
+ifeq (yes,$(build-shared))
|
|
|
|
$(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
|
|
- $(LINK.o) -pie -Wl,-O1 \
|
|
+ $(LINK.o) -Wl,-O1 \
|
|
$(sysdep-LDFLAGS) $(config-LDFLAGS) \
|
|
$(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
|
|
$(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
|