فهرست منبع

Have to add back softokn3 to the link libs - dependent libs are linked directly against it and expect it to be present at link time.

Rich Megginson 20 سال پیش
والد
کامیت
b036f9d942
1فایلهای تغییر یافته به همراه2 افزوده شده و 3 حذف شده
  1. 2 3
      components.mk

+ 2 - 3
components.mk

@@ -218,13 +218,12 @@ endif
 SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
 # add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
 SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign
-# as of NSS 3.11, no longer need to link with softokn3
-SECURITY_LIBNAMES = ssl3 nss3
+SECURITY_LIBNAMES = ssl3 nss3 softokn3
 # these libs have a corresponding .chk file
 SECURITY_NEED_CHK = softokn3
 
 # these are the libs we need at runtime
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3
+SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3
 
 # freebl for all platforms is new for NSS 3.11
 # there are some platform specific versions as well