diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2006-04-07 22:22:18 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-04-07 22:22:18 +0000 |
| commit | ef8cf93e817364e0ddab2bf89d5ddb4f8e0fd6fe (patch) | |
| tree | d26f76bc780be2053506363d939d26323d3fd3d4 | |
| parent | dc26b28c924b0d71b0ce39aa2be28389ed226fb5 (diff) | |
| download | ds-ef8cf93e817364e0ddab2bf89d5ddb4f8e0fd6fe.tar.gz ds-ef8cf93e817364e0ddab2bf89d5ddb4f8e0fd6fe.tar.xz ds-ef8cf93e817364e0ddab2bf89d5ddb4f8e0fd6fe.zip | |
Moved the SMARTHEAP macro setting from slapd local Makefile to global nsconfig.mk so that the makefile used for packaging gets the info.
| -rw-r--r-- | ldap/servers/slapd/Makefile | 27 | ||||
| -rw-r--r-- | nsconfig.mk | 27 |
2 files changed, 27 insertions, 27 deletions
diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile index 71e1788a..8fce51f5 100644 --- a/ldap/servers/slapd/Makefile +++ b/ldap/servers/slapd/Makefile @@ -77,33 +77,6 @@ CFLAGS+=-DQUANTIFYING LDAP_DONT_USE_SMARTHEAP=1 endif -# 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 - ifndef LDAP_DONT_USE_SMARTHEAP include $(BUILD_ROOT)/ns_usesh.mk INCLUDES+=-I$(SH_INCLUDE) diff --git a/nsconfig.mk b/nsconfig.mk index 46654bf8..b9209955 100644 --- a/nsconfig.mk +++ b/nsconfig.mk @@ -86,6 +86,33 @@ endif 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 |