diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2005-02-14 19:52:13 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2005-02-14 19:52:13 +0000 |
| commit | 8745246ed1c1a247e3a78b318cdc4e91d32ead73 (patch) | |
| tree | cc6e616a16e2c4d430ceec40b8c3e1eabcbe5729 | |
| parent | 2d65b2c45b1e1cb17342449128638dc7dbc07b7d (diff) | |
| download | ds-8745246ed1c1a247e3a78b318cdc4e91d32ead73.tar.gz ds-8745246ed1c1a247e3a78b318cdc4e91d32ead73.tar.xz ds-8745246ed1c1a247e3a78b318cdc4e91d32ead73.zip | |
Updated nss, nspr, dbm, and jss component versions
| -rw-r--r-- | component_versions.mk | 10 | ||||
| -rw-r--r-- | components.mk | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/component_versions.mk b/component_versions.mk index 2cdd46b3..d5aaa089 100644 --- a/component_versions.mk +++ b/component_versions.mk @@ -20,12 +20,12 @@ # naming scheme. # NSPR ifndef NSPR_RELDATE - NSPR_RELDATE = DS7.0 + NSPR_RELDATE = v4.4.1 endif # SECURITY (NSS) LIBRARY ifndef SECURITY_RELDATE - SECURITY_RELDATE = DS7.0 + SECURITY_RELDATE = NSS_3_9_3_RTM endif # LIBDB @@ -39,7 +39,7 @@ endif # DBM Library ifndef DBM_RELDATE - DBM_RELDATE = DS7.0 + DBM_RELDATE = DBM_1_61_RTM endif # SMARTHEAP @@ -151,11 +151,11 @@ ifndef JSS_COMP endif ifndef JSS_VERSION - JSS_VERSION=DS7.0 + JSS_VERSION=JSS_3_5_1_RTM endif ifndef JSS_JAR_VERSION - JSS_JAR_VERSION=3 + JSS_JAR_VERSION=351 endif ifndef SASL_VERSDIR diff --git a/components.mk b/components.mk index 7f222b4e..477088ff 100644 --- a/components.mk +++ b/components.mk @@ -182,7 +182,11 @@ NSPR_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/nspr NSPR_ABS_BUILD_DIR = $(NSCP_ABS_DISTDIR_FULL_RTL)/nspr NSPR_LIBPATH = $(NSPR_BUILD_DIR)/lib NSPR_INCLUDE = -I$(NSPR_BUILD_DIR)/include +ifeq ($(ARCH), Linux) +NSPR_IMPORT = $(COMPONENTS_DIR)/nspr20/$(NSPR_RELDATE)/RHEL3/$(FULL_RTL_OBJDIR) +else NSPR_IMPORT = $(COMPONENTS_DIR)/nspr20/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR) +endif NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,$(NSPR_LIBNAMES))) LIBS_TO_PKG += $(NSPR_LIBS_TO_PKG) @@ -224,7 +228,11 @@ DBM_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/dbm DBM_LIBPATH = $(DBM_BUILD_DIR)/lib DBM_INCDIR = $(DBM_BUILD_DIR)/include DBM_DEP = $(DBM_LIBPATH)/libdbm.$(LIB_SUFFIX) +ifeq ($(ARCH), Linux) +DBM_IMPORT = $(COMPONENTS_DIR)/dbm/$(DBM_RELDATE)/RHEL3/$(NSOBJDIR_NAME) +else DBM_IMPORT = $(COMPONENTS_DIR)/dbm/$(DBM_RELDATE)/$(NSOBJDIR_NAME) +endif DBM_INCLUDE = -I$(DBM_INCDIR) DBM_LIBNAMES = dbm @@ -273,7 +281,11 @@ else SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign endif SECURITY_LIBNAMES = ssl3 nss3 softokn3 +ifeq ($(ARCH), Linux) +SECURITY_IMPORT = $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)/RHEL3/$(FULL_RTL_OBJDIR) +else SECURITY_IMPORT = $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)/$(FULL_RTL_OBJDIR) +endif SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) SECURITY_LIBNAMES.pkg += smime3 |