Bug 1272693 - [1.1] Disable building libpkix. r=keeler,ted

This commit is contained in:
Eugen Sawin 2016-07-29 15:21:07 +02:00
parent 47a98b8ad1
commit a90cb717a5
3 changed files with 8 additions and 2 deletions

View File

@ -323,7 +323,10 @@ NSS_DIRS += $(NSS_STATIC_DIRS)
# TODO: The following can be replaced by something simpler when bug 844884
# is fixed.
# Remaining nss/lib directories
NSS_DIRS += nss/lib/freebl nss/lib/softoken nss/lib/jar nss/lib/crmf nss/lib/ckfw nss/lib/libpkix
NSS_DIRS += nss/lib/freebl nss/lib/softoken nss/lib/jar nss/lib/crmf nss/lib/ckfw
DEFAULT_GMAKE_FLAGS += NSS_DISABLE_LIBPKIX=1
ifeq (WINNT,$(OS_TARGET))
NSS_DIRS += nss/lib/zlib
endif

View File

@ -142,7 +142,6 @@ CERT_NewCertList
CERT_NewTempCertificate
CERT_NicknameStringsFromCertList
CERT_OCSPCacheSettings
CERT_PKIXVerifyCert
CERT_RemoveCertListNode
CERT_RFC1485_EscapeAndQuote
CERT_SaveSMimeProfile

View File

@ -6639,6 +6639,10 @@ AC_SUBST(MOZ_ENABLE_MASK_AS_SHORTHAND)
# Avoid using obsolete NSPR features
AC_DEFINE(NO_NSPR_10_SUPPORT)
# Don't build NSS libpkix
NSS_DISABLE_LIBPKIX=1
AC_SUBST(NSS_DISABLE_LIBPKIX)
MOZ_CREATE_CONFIG_STATUS()
if test "$COMPILE_ENVIRONMENT"; then