diff options
| author | Andras Timar <andras.timar@collabora.com> | 2018-08-09 04:36:29 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-09 04:36:29 -0700 |
| commit | eac40e7f0ff0ffa1be757da66544cbcb33a5b8f5 (patch) | |
| tree | 6baf60d207975d0494d1ff2d3cd8d1019d214989 | |
| parent | 906a406fb3df739fa3592879a75a49d3d417c41e (diff) | |
nss build fix with VS2013
Change-Id: I18128d8a4a18bf6104166836058c9aa25b583686
| -rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 2 | ||||
| -rw-r--r-- | external/nss/nss-winXP-sdk.patch.1 | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 314ff875ecbd..a9ce14ea20bb 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -30,6 +30,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.cygwin64.in32bit.patch) \ $(if $(filter WNT,$(OS)), \ external/nss/nss.vs2015.pdb.patch) \ + $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \ + external/nss/nss-winXP-sdk.patch.1) \ $(if $(filter WNT,$(OS)), \ external/nss/nss.utf8bom.patch.1) \ )) diff --git a/external/nss/nss-winXP-sdk.patch.1 b/external/nss/nss-winXP-sdk.patch.1 index 5273e71705b6..a8a0f007952f 100644 --- a/external/nss/nss-winXP-sdk.patch.1 +++ b/external/nss/nss-winXP-sdk.patch.1 @@ -1,12 +1,14 @@ diff -ur nss.org/nss/coreconf/config.mk nss/nss/coreconf/config.mk --- nss.org/nss/coreconf/config.mk 2016-03-15 14:52:19.706093300 +0100 +++ nss/nss/coreconf/config.mk 2016-03-15 14:56:51.549914800 +0100 -@@ -203,6 +203,8 @@ +@@ -203,3 +203,10 @@ # Hide old, deprecated, TLS cipher suite names when building NSS DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES ++ +# build with 7.1A SDK for winXP compatibility +DEFINES += -D_USING_V110_SDK71_ - - # Mozilla's mozilla/modules/zlib/src/zconf.h adds the MOZ_Z_ prefix to zlib - # exported symbols, which causes problem when NSS is built as part of Mozilla. ++DEFINES += -Dinline=__inline ++DEFINES += -Dsnprintf=_snprintf ++DEFINES += -D_ALLOW_KEYWORD_MACROS ++NSS_DISABLE_GTESTS=1 |