mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nss build when targeting windows XP (using 7.1A SDK)

Browse Source 
otherwise build fails because of macro redefinitions warnings (that are
now fatal because of warnings=errors)

Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7
This commit is contained in:
Christian Lohmaier
2016-03-15 15:09:45 +01:00
parent ce08a8e24e
commit 09e201fcf2
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/nss/UnpackedTarball_nss.mk vendored
View File

@@ -32,6 +32,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.cygwin64.in32bit.patch) \ external/nss/nss.cygwin64.in32bit.patch) \
$(if $(filter WNTMSC,$(OS)$(COM)), \ $(if $(filter WNTMSC,$(OS)$(COM)), \
external/nss/nss.vs2015.pdb.patch) \ external/nss/nss.vs2015.pdb.patch) \
$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
external/nss/nss-winXP-sdk.patch.1) \
)) ))
# nss-pem is only needed for internal curl to read the NSS CA database # nss-pem is only needed for internal curl to read the NSS CA database

9
external/nss/nss-winXP-sdk.patch.1 vendored Normal file
View File

@@ -0,0 +1,9 @@
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
@@ -188,3 +188,5 @@
# 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_