SF.net SVN: gar:[23385] csw/mgar/pkg/mozldap/trunk/Makefile

[cgrzemba at users.sourceforge.net]

Revision: 23385
          http://sourceforge.net/p/gar/code/23385
Author:   cgrzemba
Date:     2014-04-09 09:19:59 +0000 (Wed, 09 Apr 2014)
Log Message:
-----------
mozldap/trunk: fix configure options for GARFLAVOR

Modified Paths:
--------------
    csw/mgar/pkg/mozldap/trunk/Makefile

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2014-04-09 07:33:29 UTC (rev 23384)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2014-04-09 09:19:59 UTC (rev 23385)
@@ -23,15 +23,18 @@
 NSPR and NSS for crypto.
 endef
 
-MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src
+MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += COPYING
 
 BUILD_DEP_PKGS = CSWlibsvrcore0-dev
+
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
-GARCOMPILER = SOS12U2
 
+GARCOMPILER = SOS12U3
+# GARFLAVOR = DBG
+
 PACKAGES += CSWlibldap60
 CATALOGNAME_CSWlibldap60 = libldap60
 PKGFILES_CSWlibldap60 += $(call baseisadirs,$(libdir),libldap60\.so)
@@ -130,25 +133,28 @@
 # header file namespace.
 
 # override the standard paths
-bindir=$(prefix)/dirsrv/bin
+bindir=$(prefix)/dirsrv/bin/$(MM_BINDIR)
 includedir=$(prefix)/include/dirsrv
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit
 CONFIGURE_ARGS_isa-amd64 = --enable-64bit
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
-CONFIGURE_ARGS_OPT += --with-svrcore=$(prefix)
-CONFIGURE_ARGS_OPT += --with-sasl
-CONFIGURE_ARGS_OPT += --with-sasl-inc=$(prefix)/include/sasl
-CONFIGURE_ARGS_OPT += --with-sasl-lib=$(libdir)
-CONFIGURE_ARGS_OPT += --enable-clu
+CONFIGURE_ARGS += --with-svrcore=$(libdir)
+CONFIGURE_ARGS += --with-sasl
+CONFIGURE_ARGS += --with-sasl-inc=$(prefix)/include/sasl
+CONFIGURE_ARGS += --with-sasl-lib=$(libdir)
+CONFIGURE_ARGS += --enable-clu
 CONFIGURE_ARGS_OPT += --enable-optimize="-xO3"
 CONFIGURE_ARGS_OPT += --disable-debug
 CONFIGURE_ARGS_OPT += --enable-strip
-CONFIGURE_ARGS_OPT += --with-nss-inc=$(prefix)/include/nss
-CONFIGURE_ARGS_OPT += --with-nss-lib=$(libdir)
-CONFIGURE_ARGS_OPT += --with-nspr-inc=$(prefix)/include/nspr
-CONFIGURE_ARGS_OPT += --with-nspr-lib=$(libdir)
+CONFIGURE_ARGS_DBG += --enable-optimize="no"
+CONFIGURE_ARGS_DBG += --enable-debug
+CONFIGURE_ARGS_DBG += --disable-strip
+CONFIGURE_ARGS += --with-nss-inc=$(prefix)/include/nss
+CONFIGURE_ARGS += --with-nss-lib=$(libdir)
+CONFIGURE_ARGS += --with-nspr-inc=$(prefix)/include/nspr
+CONFIGURE_ARGS += --with-nspr-lib=$(libdir)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
 CPPFLAGS=
@@ -159,7 +165,11 @@
 TEST_TARGET = 
 TEST_SCRIPTS = 
 BUILD64_LIBS_ONLY = 1
-EXTRA_LINKER_FLAGS = -liconv
+# EXTRA_LINKER_FLAGS = -liconv
+# remove -L/opt/csw/lib
+LDFLAGS = $(CFLAGS)
+EXTRA_BUILD_ENV_DBG += LDAP_DEBUG=1
+EXTRA_BUILD_ENV += $(EXTRA_BUILD_ENV_$(GARFLAVOR))
 
 configure-c-sdk:
 	(cd $(WORKSRC) && mkdir -p build inst)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.