Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-09 13:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

One only needs to link with either libcrypto or freebl. We need to copy

Browse Source 
freebl/sha_fast.{c,h} to libcrypto to make libcrypto complete.
Modified files: nss/cmd/platlibs.mk, nss/lib/Makefile,
nss/lib/fortcrypt/swfort/pkcs11/Makefile.
This commit is contained in:
wtc%netscape.com 2000-09-21 06:20:44 +00:00
parent 23dcd57680
commit c42dded4ee
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/nss/cmd/platlibs.mk
View File

@ -35,6 +35,7 @@
ifeq ($(OS_ARCH), WINNT)
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
CRYPTOLIB=$(DIST)/lib/freebl.lib
ifdef MOZILLA_SECURITY_BUILD
CRYPTOLIB=$(DIST)/lib/crypto.lib
endif
@ -56,9 +57,7 @@ EXTRA_LIBS += \
$(DIST)/lib/pk11wrap.lib \
$(DIST)/lib/certdb.lib \
$(DIST)/lib/softoken.lib \
$(DIST)/lib/freebl.lib \
$(CRYPTOLIB) \
$(DIST)/lib/freebl.lib \
$(DIST)/lib/swfci.lib \
$(DIST)/lib/secutil.lib \
$(DIST)/lib/dbm.lib \
@ -75,6 +74,7 @@ OS_LIBS += \
else
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
CRYPTOLIB=$(DIST)/lib/libfreebl.$(LIB_SUFFIX)
ifdef MOZILLA_SECURITY_BUILD
CRYPTOLIB=$(DIST)/lib/libcrypto.$(LIB_SUFFIX)
endif
@ -98,9 +98,7 @@ EXTRA_LIBS += \
$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
$(DIST)/lib/libcertdb.$(LIB_SUFFIX) \
$(DIST)/lib/libswfci.$(LIB_SUFFIX) \
$(DIST)/lib/libfreebl.$(LIB_SUFFIX) \
$(CRYPTOLIB) \
$(DIST)/lib/libfreebl.$(LIB_SUFFIX) \
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
$(NULL)

3
security/nss/lib/Makefile
View File

@ -83,6 +83,7 @@ export::
$(NSINSTALL) -m 444 $$file crypto; \
fi; \
done; \
$(NSINSTALL) -m 444 crypto/nscertinit.c certdb; \
$(NSINSTALL) -m 444 freebl/sha_fast.c crypto; \
$(NSINSTALL) -m 444 freebl/sha_fast.h crypto; \
fi
endif

16
security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
View File

@ -40,13 +40,13 @@ include $(CORE_DEPTH)/coreconf/config.mk
# can't do this in manifest.mn because OS_ARCH isn't defined there.
ifeq ($(OS_ARCH), WINNT)
CRYPTO_LIBS = $(DIST)/lib/freebl.lib
CRYPTO_LIB = $(DIST)/lib/freebl.lib
ifdef MOZILLA_SECURITY_BUILD
CRYPTO_LIBS += $(DIST)/lib/crypto.lib
CRYPTO_LIB = $(DIST)/lib/crypto.lib
endif
ifdef MOZILLA_BSAFE_BUILD
CRYPTO_LIBS += $(DIST)/lib/bsafe41.lib
CRYPTO_LIB = $(DIST)/lib/bsafe41.lib
endif
# $(DIST)/lib/dbm.lib
@ -54,7 +54,7 @@ endif
EXTRA_LIBS = \
$(DIST)/lib/swfci.lib \
$(DIST)/lib/softoken.lib \
$(CRYPTO_LIBS) \
$(CRYPTO_LIB) \
$(DIST)/lib/secutil.lib \
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
@ -71,19 +71,19 @@ else
#
ifneq ($(OS_ARCH), OSF1)
CRYPTO_LIBS = $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
CRYPTO_LIB = $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
ifdef MOZILLA_SECURITY_BUILD
CRYPTO_LIBS += $(DIST)/lib/libcrypto.$(LIB_SUFFIX)
CRYPTO_LIB = $(DIST)/lib/libcrypto.$(LIB_SUFFIX)
endif
ifdef MOZILLA_BSAFE_BUILD
CRYPTO_LIBS += $(DIST)/lib/libbsafe.$(LIB_SUFFIX)
CRYPTO_LIB = $(DIST)/lib/libbsafe.$(LIB_SUFFIX)
endif
EXTRA_LIBS += \
$(DIST)/lib/libswfci.$(LIB_SUFFIX) \
$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
$(CRYPTO_LIBS) \
$(CRYPTO_LIB) \
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
$(DIST)/lib/libplc4.$(LIB_SUFFIX) \
$(DIST)/lib/libplds4.$(LIB_SUFFIX) \