summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-03-15 15:09:45 +0100
committerAndras Timar <andras.timar@collabora.com>2016-03-17 14:36:47 +0100
commit819d11023b17ab1ad8ce2cb0eed0835cd3df3fa0 (patch)
tree4bb0b8820b259972ea653404b9a5bb37bbbbea7b
parent61b4a873d94faa6fb4aac475b97b8d5cb0689937 (diff)
fix nss build when targeting windows XP (using 7.1A SDK)
otherwise build fails because of macro redefinitions warnings (that are now fatal because of warnings=errors) (cherry picked from commit 09e201fcf2813152335d50588dae0c38adc88d51) Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7 Reviewed-on: https://gerrit.libreoffice.org/23272 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 74c4ae75c06068f8c208973636825603ca49a00e)
-rw-r--r--external/nss/UnpackedTarball_nss.mk2
-rw-r--r--external/nss/nss-winXP-sdk.patch.19
2 files changed, 11 insertions, 0 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index ba358cb899ba..383fd71b45d8 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-ios.patch) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
external/nss/nss.cygwin64.in32bit.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
diff --git a/external/nss/nss-winXP-sdk.patch.1 b/external/nss/nss-winXP-sdk.patch.1
new file mode 100644
index 000000000000..2c8189215083
--- /dev/null
+++ b/external/nss/nss-winXP-sdk.patch.1
@@ -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_