Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 114748: now that NSS uses the same LIB_PREFIX as the Mozilla client,

Browse Source 
removed the obsolete NSS_LIB_PREFIX. r=cls.  The patch was originally
contributed by Javier Pedemonte <pedemont@us.ibm.com>.
Modified Files:
	config/config.mk security/manager/Makefile.in
	security/manager/ssl/src/Makefile.in
This commit is contained in:
wtc%netscape.com 2002-02-14 15:29:22 +00:00
parent 6a0a965489
commit c2620c0df7
3 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
config/config.mk
View File

@ -158,45 +158,18 @@ FINAL_LINK_LIBS = $(DEPTH)/config/final-link-libs
FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps
FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
# The use of LIB_PREFIX for OS/2 VA builds is inconsistent
# due to bug 114748, so use _NSS_LIB_PREFIX instead
ifeq ($(MOZ_OS2_TOOLS),VACPP)
NSS_LIB_PREFIX=lib
else
NSS_LIB_PREFIX=$(LIB_PREFIX)
endif
#
# NSS libs needed for final link in static build
#
NSS_3_4=1
ifdef NSS_3_4
NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)smime3$(DLL_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)ssl3$(DLL_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)nss3$(DLL_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)softokn3$(DLL_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)smime3$(DLL_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)ssl3$(DLL_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nss3$(DLL_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
$(NULL)
else
NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)smime.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)ssl.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)nss.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)certhi.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)certdb.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)softoken.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)freebl.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)secutil.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)dbm.$(LIB_SUFFIX) \
$(NULL)
endif
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)

6
security/manager/Makefile.in
View File

@ -88,14 +88,12 @@ dependclean export::
$(MAKE) -C ssl $@
$(MAKE) -C pki $@
# The use of LIB_PREFIX for OS/2 VA builds is inconsistent
# due to bug 114748, so use _NSS_LIB_PREFIX instead
libs::
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(NSS_LIB_PREFIX)dbm.$(LIB_SUFFIX)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
else
cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(NSS_LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(NSS_LIB_PREFIX)dbm.$(LIB_SUFFIX)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
endif
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin

2
security/manager/ssl/src/Makefile.in
View File

@ -115,7 +115,7 @@ SOFTOKEN3_LIB = $(LIB_PREFIX)softokn3$(DLL_SUFFIX)
endif
EXTRA_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(SMIME3_LIB) \
$(DIST)/lib/$(SSL3_LIB) \
$(DIST)/lib/$(NSS3_LIB) \