diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-03-11 04:50:00 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-03-11 04:50:00 +0000 |
| commit | 385a06685da620c0753ef6daf187f4eb2d5f7517 (patch) | |
| tree | a0c5401ac79eca1f2b667e23bd28b81c5a37f379 /ldap/servers | |
| parent | ac41be1c40808469de3511f6324b567153d4d957 (diff) | |
| download | ds-385a06685da620c0753ef6daf187f4eb2d5f7517.tar.gz ds-385a06685da620c0753ef6daf187f4eb2d5f7517.tar.xz ds-385a06685da620c0753ef6daf187f4eb2d5f7517.zip | |
use mtmalloc instead of SmartHeap on Solaris
Diffstat (limited to 'ldap/servers')
| -rw-r--r-- | ldap/servers/Makefile | 13 | ||||
| -rw-r--r-- | ldap/servers/slapd/Makefile | 10 | ||||
| -rw-r--r-- | ldap/servers/slapd/libsh_stub/Makefile | 7 |
3 files changed, 8 insertions, 22 deletions
diff --git a/ldap/servers/Makefile b/ldap/servers/Makefile index 013325f6..01b2797c 100644 --- a/ldap/servers/Makefile +++ b/ldap/servers/Makefile @@ -24,10 +24,6 @@ PRE_SLAPD_EXTRAS=_ntmsgdll POST_SLAPD_EXTRAS=_ntwdog _ntperfdll endif -ifeq ($(ARCH), SOLARIS) -PRE_SLAPD_EXTRAS=_libsh_stub -endif - all: $(PRE_SLAPD_EXTRAS) _slapd $(POST_SLAPD_EXTRAS) _backends _plugins _snmp _slapdtools @@ -68,12 +64,6 @@ _ntperfdll: cd slapd/ntperfdll; $(MAKE) $(MFLAGS) all endif -ifeq ($(ARCH), SOLARIS) -_libsh_stub: - cd slapd/libsh_stub; $(MAKE) $(MFLAGS) all -endif - - clean: cd slapd; $(MAKE) $(MFLAGS) clean ifeq ($(ARCH), WINNT) @@ -81,9 +71,6 @@ ifeq ($(ARCH), WINNT) cd slapd/ntwdog; $(MAKE) $(MFLAGS) clean cd slapd/ntperfdll; $(MAKE) $(MFLAGS) clean endif -ifeq ($(ARCH), SOLARIS) - cd slapd/libsh_stub; $(MAKE) $(MFLAGS) clean -endif cd slapd/back-ldbm; $(MAKE) $(MFLAGS) clean cd slapd/back-ldif; $(MAKE) $(MFLAGS) clean cd plugins; $(MAKE) $(MFLAGS) clean diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile index cd027f17..7a4b3a45 100644 --- a/ldap/servers/slapd/Makefile +++ b/ldap/servers/slapd/Makefile @@ -47,8 +47,8 @@ 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, Solaris and HPUX. -# Solaris 8 has mtmalloc but we still build on and support Solaris 2.6. +# 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) @@ -181,10 +181,14 @@ LDFLAGS+= -xarch=v9 endif endif -ifeq ($(ARCH), SOLARISx86) +ifeq ($(ARCH), SOLARIS) SH_LIB = -lmtmalloc endif +ifeq ($(ARCH), SOLARISx86) + SH_LIB= -lmtmalloc +endif + OBJS = $(addprefix $(OBJDEST)/, $(SLAPD_OBJS)) STUB_OBJS = $(addprefix $(OBJDEST)/, stubrepl.o) diff --git a/ldap/servers/slapd/libsh_stub/Makefile b/ldap/servers/slapd/libsh_stub/Makefile index c47d3b53..02f081cc 100644 --- a/ldap/servers/slapd/libsh_stub/Makefile +++ b/ldap/servers/slapd/libsh_stub/Makefile @@ -30,12 +30,7 @@ CFLAGS = -G $(SLCFLAGS) # link libmtmalloc.so when built on 5.8 or 5.9 ifeq ($(ARCH), SOLARIS) - ifeq ($(NSOS_RELEASE), 5.8) - LINKFLAGS = -lmtmalloc - endif - ifeq ($(NSOS_RELEASE), 5.9) - LINKFLAGS = -lmtmalloc - endif + LINKFLAGS = -lmtmalloc LIBSH_STUB = libsh_stub else # do nothing on non-SOLARIS platforms |