[Fedora-directory-commits] ldapserver nsconfig.mk,1.20,1.21

Noriko Hosoi (nhosoi) fedora-directory-commits at redhat.com
Fri Apr 7 22:22:20 UTC 2006


Author: nhosoi

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814

Modified Files:
	nsconfig.mk 
Log Message:
Moved the SMARTHEAP macro setting from slapd local Makefile to global nsconfig.mk so that the makefile used for packaging gets the info.



Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nsconfig.mk	7 Apr 2006 01:33:30 -0000	1.20
+++ nsconfig.mk	7 Apr 2006 22:22:17 -0000	1.21
@@ -86,6 +86,33 @@
 include $(BUILD_ROOT)/nsdefs.mk
 include $(BUILD_ROOT)/component_versions.mk
 
+# It looks like most of the latest versions of Unix that we ship on
+# have a good enough heap implementations that they don't need 
+# SmartHeap.  We still need it on NT and HPUX.
+# Solaris 8 and later has mtmalloc
+# By contract HPUX must be aligned with Solaris.
+ifneq ($(ARCH), SOLARIS)
+ifneq ($(ARCH), WINNT)
+ifneq ($(ARCH), HPUX)
+LDAP_DONT_USE_SMARTHEAP=1
+endif
+endif
+endif
+
+ifeq ($(ARCH), HPUX)
+  ifeq ($(NSOS_TEST1),ia64)
+    LDAP_DONT_USE_SMARTHEAP=1
+    ifeq ($(DEBUG), optimize)
+      CFLAGS+=+O3
+    endif
+  endif
+endif
+
+# Don't use smartheap for debug builds
+ifeq ($(DEBUG), full)
+LDAP_DONT_USE_SMARTHEAP=1
+endif
+
 ifeq ($(SECURITY), domestic)
   SEC_SUFFIX = D
 else




More information about the Fedora-directory-commits mailing list