diff options
| author | ian.mcgreer%sun.com <devnull@localhost> | 2003-01-24 15:44:35 +0000 |
|---|---|---|
| committer | ian.mcgreer%sun.com <devnull@localhost> | 2003-01-24 15:44:35 +0000 |
| commit | 8617e632775546a9ae508a1793e55f7c0165c629 (patch) | |
| tree | f97996e3aec73576f2d631d21eb3894e4c41b7f9 | |
| parent | 3b3a760df22d2111c1bb0ca07ab37d6f79b4b702 (diff) | |
| download | nss-hg-8617e632775546a9ae508a1793e55f7c0165c629.tar.gz | |
mac build changes
| -rw-r--r-- | security/nss/Makefile | 27 | ||||
| -rw-r--r-- | security/nss/lib/pki/pkibase.c | 1 | ||||
| -rw-r--r-- | security/nss/lib/pkix/src/config.mk | 1 |
3 files changed, 14 insertions, 15 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index d7373ed82..321db9af0 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -79,13 +79,6 @@ nss_build_all: build_coreconf build_nspr build_dbm all build_coreconf: cd $(CORE_DEPTH)/coreconf ; $(MAKE) -# -# NSPR has two build systems: autoconf and classic. -# The build_nspr rule needs to work with both. -# - -ifdef NSPR_AUTOCONF - NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)/config.status NSPR_CONFIGURE = $(CORE_DEPTH)/../nsprpub/configure @@ -105,6 +98,9 @@ endif ifdef USE_DEBUG_RTL NSPR_CONFIGURE_OPTS += --enable-debug-rtl endif +ifdef NS_USE_GCC +NSPR_COMPILERS = CC=gcc CXX=g++ +endif # # Some pwd commands on Windows (for example, the pwd @@ -130,7 +126,7 @@ endif $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) $(NSINSTALL) -D $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; \ - sh ../configure \ + $(NSPR_COMPILERS) sh ../configure \ $(NSPR_CONFIGURE_OPTS) \ --with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-includedir='$(NSPR_PREFIX)/include' @@ -138,13 +134,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) build_nspr: $(NSPR_CONFIG_STATUS) cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) -else # NSPR classic build system - -build_nspr: - cd $(CORE_DEPTH)/../nsprpub ; $(MAKE) OBJDIR_NAME=${OBJDIR_NAME} - -endif # NSPR_AUTOCONF - build_dbm: cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs @@ -174,3 +163,11 @@ endif endif nss_RelEng_bld: build_coreconf import all + +ifeq ($(OS_ARCH),SunOS) +solarispkg: + @echo Making Solaris packages. + rm -rf pkg/$(OBJDIR) + cp -r pkg/solaris pkg/$(OBJDIR) + $(MAKE) -C pkg/$(OBJDIR) publish +endif diff --git a/security/nss/lib/pki/pkibase.c b/security/nss/lib/pki/pkibase.c index 1bb79a998..d1a2c1a15 100644 --- a/security/nss/lib/pki/pkibase.c +++ b/security/nss/lib/pki/pkibase.c @@ -489,6 +489,7 @@ nssPKIObject_GetWriteToken ( PRUint32 i; NSSToken *token = NULL; nssCryptokiObject *instance; + *rvSessionOpt = NULL; PZ_Lock(object->lock); for (i=0; i<object->numInstances; i++) { instance = object->instances[i]; diff --git a/security/nss/lib/pkix/src/config.mk b/security/nss/lib/pkix/src/config.mk index f1559cb8c..5b50bf2e4 100644 --- a/security/nss/lib/pkix/src/config.mk +++ b/security/nss/lib/pkix/src/config.mk @@ -59,6 +59,7 @@ else # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ -L$(DIST)/lib/ \ + -lsoftokn3 \ -lnss4 \ -lplc4 \ -lplds4 \ |