Depend on libc.so for dynamic loading and for Linux ld.so.

diff --git a/db/Makefile b/db/Makefile
index 0ed798b6cfc169bc5924dade31cdbbcbf7beb792..331c8b1d74c5f25dd89a1ae1413cd8912b8536ea 100644 (file)
--- a/db/Makefile
+++ b/db/Makefile
@@ -45,3 +45,8 @@ $(objpfx)makedb: $(objpfx)libdb.so$(libdb.so-version)
 else
 $(objpfx)makedb: $(objpfx)libdb.a
 endif
+
+# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+# This ensures they will load libc.so for needed symbols if loaded by
+# a statically-linked program that hasn't already loaded it.
+$(objpfx)libdb.so: $(common-objpfx)libc.so

diff --git a/login/Makefile b/login/Makefile
index 65982661b656bcb7557b24d3a06fabb02be9f6eb..6c10a5aff43f617c79d76bb4581b0c6b25569ca1 100644 (file)
--- a/login/Makefile
+++ b/login/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -35,5 +35,9 @@ extra-libs-others := $(extra-libs)
 
 libutil-routines:= login login_tty logout logwtmp pty
 
-
 include ../Rules
+
+# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+# This ensures they will load libc.so for needed symbols if loaded by
+# a statically-linked program that hasn't already loaded it.
+$(objpfx)libutil.so: $(common-objpfx)libc.so

diff --git a/math/Makefile b/math/Makefile
index 550e9d6c5011c49bad3c0b8c81c8d392dc310945..7665fb97e51b25f9e2c836978bf014b5234648e0 100644 (file)
--- a/math/Makefile
+++ b/math/Makefile
@@ -98,3 +98,8 @@ override CFLAGS += -Wno-uninitialized -Wno-write-strings
 $(objpfx)libieee.a: $(objpfx)ieee-math.o
        rm -f $@
        ln $< $@
+
+# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+# This ensures they will load libc.so for needed symbols if loaded by
+# a statically-linked program that hasn't already loaded it.
+$(objpfx)libm.so: $(common-objpfx)libc.so

diff --git a/md5-crypt/Makefile b/md5-crypt/Makefile
index 0d17af16672a3c1ff074544f361fe23c94651839..6216ddb437b15962c1a88d7531a8eeca5b671d0f 100644 (file)
--- a/md5-crypt/Makefile
+++ b/md5-crypt/Makefile
@@ -64,3 +64,8 @@ $(objpfx)$(patsubst %,$(libtype$o),md5crypt): \
 endef
 object-suffixes-left = $(object-suffixes)
 include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes))
+
+# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+# This ensures they will load libc.so for needed symbols if loaded by
+# a statically-linked program that hasn't already loaded it.
+$(objpfx)libcrypt.so: $(common-objpfx)libc.so

diff --git a/nis/Makefile b/nis/Makefile
index 98ef4090a220b184e4b2dfad7d1a9037b679647d..e2be7f965f5f001ac2f40e87ab9c5012f5a9e9f6 100644 (file)
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -81,7 +81,7 @@ $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
 # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
 # This ensures they will load libc.so for needed symbols if loaded by
 # a statically-linked program that hasn't already loaded it.
-$(services:%=$(objpfx)libnss_%.so): $(common-objpfx)libc.so
+$(services:%=$(objpfx)libnss_%.so) $(objpfx)libnsl.so: $(common-objpfx)libc.so
 
 
 ifeq ($(build-shared),yes)

diff --git a/resolv/Makefile b/resolv/Makefile
index 41623cd06786c4f6c03bc713d512862b22edb566..7b99aee550fd04a5a42113ca56331d581e55338b 100644 (file)
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -56,4 +56,4 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
 $(objpfx)libresolv.so: $(common-objpfx)libc.so
 
 # The DNS NSS modules needs the resolver.
-$(objpfx)libnss_dns.so: $(objpfx)libresolv.so
+$(objpfx)libnss_dns.so: $(objpfx)libresolv.so $(common-objpfx)libc.so