diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-08-31 21:05:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-02 14:08:51 +0000 |
| commit | c4afb5d19342d249fae841c24575a5f9ecacdfe2 (patch) | |
| tree | 3408ad1d25f2f7b4057e74c54d9c83daf9d86fb3 /external | |
| parent | c214802883054df349650835f86f9ea9468b778a (diff) | |
Fix nss on MSVC 14.0
Change-Id: I8c2f18a509ae6686af4ede5b0daa8291d164c9fd
Reviewed-on: https://gerrit.libreoffice.org/18211
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 3 | ||||
| -rwxr-xr-x | external/nss/nss.vs2015.patch | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 1b9f45d2766a..d297ee4b1e45 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -17,7 +17,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-3.13.5-zlib-werror.patch \ external/nss/nss_macosx.patch \ external/nss/nss-win32-make.patch.1 \ - $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \ + $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch \ + external/nss/nss.vs2015.patch) \ $(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \ external/nss/nss-3.13.3-build.patch.3 \ external/nss/nss.mingw.patch.3) \ diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch new file mode 100755 index 000000000000..42a325df9e56 --- /dev/null +++ b/external/nss/nss.vs2015.patch @@ -0,0 +1,12 @@ +diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk +--- foo/nss.orig/nss/coreconf/WIN32.mk 2015-06-17 20:26:43.000000000 +0200 ++++ foo/nss/nss/coreconf/WIN32.mk 2015-08-31 20:40:40.146490300 +0200 +@@ -192,7 +192,7 @@ + ifneq ($(_MSC_VER),$(_MSC_VER_6)) + # Convert certain deadly warnings to errors (see list at end of file) + OS_CFLAGS += -we4002 -we4003 -we4004 -we4006 -we4009 -we4013 \ +- -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4054 -we4063 \ ++ -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4063 \ + -we4064 -we4078 -we4087 -we4090 -we4098 -we4390 -we4551 -we4553 -we4715 + + ifeq ($(_MSC_VER_GE_12),1) |