summaryrefslogtreecommitdiffstats
path: root/ldap/servers
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2006-08-30 02:18:05 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2006-08-30 02:18:05 +0000
commit6d6a3bbe1a051ff3b144b2c31172f9e4bf858888 (patch)
treebd23d7473b5210d019eab25d0abe4d0293669935 /ldap/servers
parent855910d56b83314281ae274fd7573635f0d7fa2b (diff)
downloadds-6d6a3bbe1a051ff3b144b2c31172f9e4bf858888.tar.gz
ds-6d6a3bbe1a051ff3b144b2c31172f9e4bf858888.tar.xz
ds-6d6a3bbe1a051ff3b144b2c31172f9e4bf858888.zip
[204563] Solaris build problem
removed "-z defs" from the command line building libslapd.so and libback-ldbm.so.
Diffstat (limited to 'ldap/servers')
-rw-r--r--ldap/servers/slapd/back-ldbm/Makefile3
-rw-r--r--ldap/servers/slapd/libmakefile19
2 files changed, 14 insertions, 8 deletions
diff --git a/ldap/servers/slapd/back-ldbm/Makefile b/ldap/servers/slapd/back-ldbm/Makefile
index 9066dd30..c4a174c1 100644
--- a/ldap/servers/slapd/back-ldbm/Makefile
+++ b/ldap/servers/slapd/back-ldbm/Makefile
@@ -134,7 +134,8 @@ EXTRA_LIBS += \
$(LDAP_LIBLDIF) \
$(LDAP_LIBAVL) \
$(DLL_EXTRA_LIBS) -lc
-LINK_DLL += -z defs
+# All the dependent libraries may not be linked with. (e.g., Cyrus SASL)
+# LINK_DLL += -z defs
endif
ifeq ($(ARCH), HPUX)
diff --git a/ldap/servers/slapd/libmakefile b/ldap/servers/slapd/libmakefile
index e1f6945b..659165ea 100644
--- a/ldap/servers/slapd/libmakefile
+++ b/ldap/servers/slapd/libmakefile
@@ -140,14 +140,19 @@ EXTRA_LIBS = $(LDAPLINK) $(SVRCORELINK) $(SECURITYLINK) $(NSPRLINK) \
$(LDAP_LIBLITEKEY)
endif
-# for Solaris, our most common unix build platform, we check for undefined
-# symbols at link time so we don't catch them at run time. To do this, we
-# set the -z defs flag. We also have to add explicitly link with the C and
-# C++ runtime libraries (e.g., -lc) because, even though ld and CC link
-# with them implicitly, -z defs will throw errors if we do not link with
-# them explicitly.
+# Comment for the following comment:
+# Updating LDAP C SDK to V6.0 has introduced a new dependent library
+# (Cyrus SASL). Instead of adding the library to EXTRA_LIBS list,
+# comment out "-z defs". If check is needed, uncomment "-z defs" and
+# append necessary libraries to EXTRA_LIBS.
+## for Solaris, our most common unix build platform, we check for undefined
+## symbols at link time so we don't catch them at run time. To do this, we
+## set the -z defs flag. We also have to add explicitly link with the C and
+## C++ runtime libraries (e.g., -lc) because, even though ld and CC link
+## with them implicitly, -z defs will throw errors if we do not link with
+## them explicitly.
ifeq ($(ARCH), SOLARIS)
-LINK_DLL += -z defs
+# LINK_DLL += -z defs
# removed -lcx from the following line
EXTRA_LIBS += -lm -lw -lc
ifdef NS_USE_NATIVE