[Fedora-directory-commits] dsbuild/ds/mod_nss Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild/ds/mod_nss
Modified Files:
Makefile
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:29:18 -0000 1.2
+++ Makefile 8 Apr 2006 19:26:59 -0000 1.3
@@ -3,9 +3,14 @@
GARNAME = mod_nss
GARVERSION = 1.0.2
CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
+ifdef USE_CVS
+CVSMODULES=mod_nss
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
LIBDEPS =
DESCRIPTION = mod_nss
@@ -23,6 +28,10 @@
INSTALL_SCRIPTS = custom
BUILD_ARGS =
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
ifdef BUILD_MODULE_RPM
ifeq ($(DEBUG),full)
FLAVOR=dbg
18 years
[Fedora-directory-commits] dsbuild/ds/mod_admserv Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild/ds/mod_admserv
Modified Files:
Makefile
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mod_admserv/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:29:12 -0000 1.2
+++ Makefile 8 Apr 2006 19:26:58 -0000 1.3
@@ -3,9 +3,14 @@
GARNAME = mod_admserv
GARVERSION = 1.0.2
CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
+ifdef USE_CVS
+CVSMODULES=mod_admserv
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
LIBDEPS =
DESCRIPTION = mod_admserv
@@ -13,6 +18,7 @@
MOZILLA_DIST = $(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla/dist
ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2/built/adminutil/$(OBJDIR_NAME)
+ICU = $(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4/built
INSTALL_SCRIPTS = custom
@@ -27,6 +33,10 @@
INSTALL_SCRIPTS = custom
BUILD_ARGS =
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
ifdef BUILD_MODULE_RPM
ifeq ($(DEBUG),full)
FLAVOR=dbg
@@ -45,7 +55,7 @@
else # BUILD_MODULE_RPM
-CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib --with-ldapsdk-inc=$(MOZILLA_DIST)/public/ldap --with-ldapsdk-lib=$(MOZILLA_DIST)/lib --with-adminutil=$(ADMINUTIL)
+CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib --with-ldapsdk-inc=$(MOZILLA_DIST)/public/ldap --with-ldapsdk-lib=$(MOZILLA_DIST)/lib --with-adminutil=$(ADMINUTIL) --with-icu=$(ICU)
ifeq ($(DEBUG),full)
CONFIGURE_ENV = CFLAGS=-g
18 years
[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile,1.4,1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild/ds/ldapserver
Modified Files:
Makefile
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 16 Feb 2006 21:33:58 -0000 1.4
+++ Makefile 8 Apr 2006 19:26:57 -0000 1.5
@@ -6,11 +6,16 @@
# have the regular download rule download the patch rather than listing it in PATCHFILES
# this is so we can override the default patch rule
#MYPATCH = ldapserver-gcc4.patch
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz $(MYPATCH)
PATCHFILES =
PKGDIR = $(ABS_GARDIR)/$(CATEGORIES)/ldapserver/work/pkg
+ifdef USE_CVS
+CVSMODULES = ldapserver
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
LIBDEPS =
DESCRIPTION = ldapserver
@@ -48,6 +53,10 @@
BUILD_ARGS += BUILD_DEBUG=optimize
endif
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
# this is our "custom" patch target
post-patch:
ifdef MYPATCH
@@ -76,6 +85,6 @@
@echo "http://directory.fedora.redhat.com/wiki/Install_Guide"
$(MAKECOOKIE)
-include ../../gar.conf.mk
+#include ../../gar.conf.mk
include ../category.mk
18 years
[Fedora-directory-commits] dsbuild/ds/directoryconsole Makefile, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild/ds/directoryconsole
Modified Files:
Makefile
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:28:38 -0000 1.2
+++ Makefile 8 Apr 2006 19:26:57 -0000 1.3
@@ -3,9 +3,14 @@
GARNAME = fedora-directoryconsole
GARVERSION = 1.0.2
CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
+ifdef USE_CVS
+CVSMODULES=directoryconsole
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
LIBDEPS =
DESCRIPTION = directoryconsole
@@ -17,6 +22,10 @@
IMPORTS=-Dconsole.location=$(ABS_GARDIR)/$(CATEGORIES)/console/work/built/release/package
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
configure-custom:
$(MAKECOOKIE)
18 years
[Fedora-directory-commits] dsbuild/ds/console Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild/ds/console
Modified Files:
Makefile
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/console/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:28:30 -0000 1.2
+++ Makefile 8 Apr 2006 19:26:56 -0000 1.3
@@ -3,9 +3,14 @@
GARNAME = fedora-console
GARVERSION = 1.0.2
CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
+ifdef USE_CVS
+CVSMODULES=console
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
LIBDEPS =
DESCRIPTION = console
@@ -17,6 +22,10 @@
IMPORTS=-Dimports.file=$(IMPORTS.FILE)
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
configure-custom:
$(MAKECOOKIE)
18 years
[Fedora-directory-commits] dsbuild/ds/adminutil Makefile,1.3,1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild/ds/adminutil
Modified Files:
Makefile
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 16 Feb 2006 21:33:53 -0000 1.3
+++ Makefile 8 Apr 2006 19:26:56 -0000 1.4
@@ -3,9 +3,14 @@
GARNAME = fedora-adminutil
GARVERSION = 1.0.2
CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
+ifdef USE_CVS
+CVSMODULES=adminutil
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
LIBDEPS =
DESCRIPTION = adminutil
@@ -22,6 +27,10 @@
BUILD_ARGS += BUILD_DEBUG=optimize
endif
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
configure-custom:
$(MAKECOOKIE)
18 years
[Fedora-directory-commits] dsbuild/ds/adminserver Makefile,1.3,1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild/ds/adminserver
Modified Files:
Makefile
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 16 Feb 2006 21:33:47 -0000 1.3
+++ Makefile 8 Apr 2006 19:26:50 -0000 1.4
@@ -3,9 +3,14 @@
GARNAME = fedora-adminserver
GARVERSION = 1.0.2
CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
+ifdef USE_CVS
+CVSMODULES=adminserver
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
LIBDEPS =
DESCRIPTION = adminserver
@@ -21,10 +26,10 @@
ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \
SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \
ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.2 \
- MOD_ADMSERV_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.2/.libs \
- MOD_RESTARTD_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.2/.libs \
- MOD_NSS_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2/.libs \
- MOD_NSS_BIN_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2
+ MOD_ADMSERV_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.2/.libs \
+ MOD_RESTARTD_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.2/.libs \
+ MOD_NSS_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2/.libs \
+ MOD_NSS_BINPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2
ifndef NOJAVA
BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work
@@ -34,6 +39,10 @@
BUILD_ARGS += BUILD_DEBUG=optimize
endif
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
configure-custom:
$(MAKECOOKIE)
18 years
[Fedora-directory-commits] dsbuild ds.conf.mk, 1.1.1.1, 1.2 gar.lib.mk, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild
Modified Files:
ds.conf.mk gar.lib.mk
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.
Index: ds.conf.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds.conf.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ds.conf.mk 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ ds.conf.mk 8 Apr 2006 19:26:49 -0000 1.2
@@ -4,3 +4,17 @@
ifdef DSMLGWJAR_VERSION
MASTER_SITES += http://directory.fedora.redhat.com/download/dsmlgwjars-$(DSMLGWJAR_VERSION)/
endif
+
+# cvs information
+# use USE_CVS=1 on the make command line to grab the sources from CVS
+# instead of from the checksummed source tarballs
+# fedora anon cvs
+FEDCVSROOT=:pserver:anonymous@cvs.fedora.redhat.com:/cvs/dirsec
+# mozilla anon cvs
+MOZCVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
+# default to fedora for now since the mozilla sources are more static
+CVSROOT=$(FEDCVSROOT)
+# default tag is HEAD
+CVSTAG=HEAD
+# each ds/*/Makefile must define the CVS modules e.g.
+#CVSMODULES=ldapserver
Index: gar.lib.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/gar.lib.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gar.lib.mk 28 Feb 2006 23:40:24 -0000 1.2
+++ gar.lib.mk 8 Apr 2006 19:26:49 -0000 1.3
@@ -32,14 +32,21 @@
URLS = $(subst ://,//,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES))))
+# use NOCACHE with makesum - if we upload a new source tarball to the official download site, we want
+# to use that one to make the checksum, not the cached one
ifdef NOCACHE
NOCACHEARG = "--header=Cache-Control: no-cache"
endif
+# these are the flags to use with the cvs export command
+CVSFLAGS=-z3 -Q
+
# Download the file if and only if it doesn't have a preexisting
# checksum file. Loop through available URLs and stop when you
# get one that doesn't return an error code.
$(DOWNLOADDIR)/%:
+# no download with cvs - we "extract" the files from CVS instead
+ifndef USE_CVS
@if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
echo " ==> Grabbing $(call TMSG_ID,$@)"; \
for i in $(filter %/$*,$(URLS)); do \
@@ -52,6 +59,7 @@
false; \
fi; \
fi
+endif
# download an http URL
http//%:
@@ -88,11 +96,17 @@
scp//%:
@scp -C $* $(DOWNLOADDIR)/
+# an svn url?
+# svn//%:
+# @svn $(SVNFLAGS) export -r $(SVNTAG) -d $(GARNAME)-$(GARVERSION) svn://$*
+
#################### CHECKSUM RULES ####################
# check a given file's checksum against $(CHECKSUM_FILE) and
# error out if it mentions the file without an "OK".
checksum-%: $(CHECKSUM_FILE)
+# no checksum with cvs - we "extract" the files from CVS instead
+ifndef USE_CVS
@echo " ==> Running checksum on $(call TMSG_ID,$*)"
@if grep -- '$*' $(CHECKSUM_FILE); then \
if LC_ALL="C" LANG="C" $(MD5) -c $(CHECKSUM_FILE) 2>&1 | grep -- '$*' | grep -v ':[ ]\+OK'; then \
@@ -106,7 +120,7 @@
echo '*** GAR GAR GAR! $(call TMSG_ID,$*) not in $(CHECKSUM_FILE) file! GAR GAR GAR! ***' 1>&2; \
false; \
fi
-
+endif
#################### EXTRACT RULES ####################
@@ -141,6 +155,11 @@
@cp $(DOWNLOADDIR)/$* $(WORKDIR)/
@$(MAKECOOKIE)
+extract-cvs:
+ @echo Doing CVS checkout of $(CVSMODULES) from $(CVSROOT) with tag $(CVSTAG)
+ @cd $(WORKDIR) ; cvs $(CVSFLAGS) export -r $(CVSTAG) -d $(GARNAME)-$(GARVERSION) $(CVSMODULES)
+ @$(MAKECOOKIE)
+
### EXTRACT FILE TYPE MAPPINGS ###
# These rules specify which of the above extract action rules to use for a
# given file extension. Often support for a given extract type can be handled
@@ -206,7 +225,6 @@
extract-%: cp-extract-%
@$(MAKECOOKIE)
-
#################### PATCH RULES ####################
# apply bzipped patches
18 years
[Fedora-directory-commits] ldapserver/ldap/servers/slapd Makefile, 1.12, 1.13
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814/ldap/servers/slapd
Modified Files:
Makefile
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: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 7 Apr 2006 01:33:37 -0000 1.12
+++ Makefile 7 Apr 2006 22:22:18 -0000 1.13
@@ -77,33 +77,6 @@
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)
18 years
[Fedora-directory-commits] ldapserver nsconfig.mk,1.20,1.21
by Doctor Conrad
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
18 years