[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/nss

[David Ostrovsky]

 external/nss/UnpackedTarball_nss.mk |    2 ++
 external/nss/nss.vs2015.pdb.patch   |   22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

New commits:
commit dcdb34007cfc95bf993dd8b764cf94a93197d578
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Fri Mar 4 19:55:16 2016 +0100

    Fix nss on MSVC 14.0 in debug mode
    
    outdir doesn't seem to be created. Use current directory for
    pdb files as the obj files are already stored in the current
    directory.
    
    Change-Id: I41dd65714d314cd374cc5de073d48f1a58b18c56
    Reviewed-on: https://gerrit.libreoffice.org/22888
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    (cherry picked from commit 1a056fdb25bd5c682f395ff94a6e1ce5618ed55a)
    Reviewed-on: https://gerrit.libreoffice.org/23099
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index bf3ef9a..0e2f20c 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 $(filter WNTMSC,$(OS)$(COM)), \
+		external/nss/nss.vs2015.pdb.patch) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss.vs2015.pdb.patch b/external/nss/nss.vs2015.pdb.patch
new file mode 100755
index 0000000..dc4f463
--- /dev/null
+++ b/external/nss/nss.vs2015.pdb.patch
@@ -0,0 +1,22 @@
+diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
+--- a/nss.orig/nss/coreconf/WIN32.mk	2016-03-04 08:30:16.306639400 +0100
++++ b/nss/nss/coreconf/WIN32.mk	2016-03-04 08:31:17.987233200 +0100
+@@ -169,15 +169,15 @@
+ 	DLLFLAGS   += -OUT:$@
+ 	ifdef MOZ_DEBUG_SYMBOLS
+ 		ifdef MOZ_DEBUG_FLAGS
+-			OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/
++			OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd./
+ 		else
+-			OPTIMIZER += -Zi -Fd$(OBJDIR)/
++			OPTIMIZER += -Zi -Fd./
+ 		endif
+ 		DLLFLAGS += -DEBUG -OPT:REF
+ 		LDFLAGS += -DEBUG -OPT:REF
+ 	endif
+     else
+-	OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
++	OPTIMIZER += -Zi -Fd./ -Od
+ 	NULLSTRING :=
+ 	SPACE      := $(NULLSTRING) # end of the line
+ 	USERNAME   := $(subst $(SPACE),_,$(USERNAME))