nss/UnpackedTarball_nss.mk | 1 +
nss/nss.windows.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
New commits:
commit dfbcb34441fed0d38e7c86f32d659ba8ab52640f
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Thu Jan 3 02:35:40 2013 +0100
force nss build to pass windows path to cl.exe
Not sure what's wrong exactly, but on one tinderbox cl fails because
of "unknown" argument (unix path to the source file). Work it around
by explicitly converting the path to windows path.
diff --git a/nss/UnpackedTarball_nss.mk b/nss/UnpackedTarball_nss.mk
index 6e9ad7b..44b9d14 100644
--- a/nss/UnpackedTarball_nss.mk
+++ b/nss/UnpackedTarball_nss.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
nss/nss.aix.patch \
nss/nss-3.13.5-zlib-werror.patch \
$(if $(filter MACOSX,$(OS)),nss/nss_macosx.patch) \
+ $(if $(filter WNTMSC,$(OS)$(COM)),nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),nss/nspr-4.9-build.patch \
nss/nss-3.13.3-build.patch \
nss/nss.mingw.patch) \
diff --git a/nss/nss.windows.patch b/nss/nss.windows.patch
new file mode 100644
index 0000000..935943b
--- /dev/null
+++ b/nss/nss.windows.patch
@@ -0,0 +1,11 @@
+--- misc/nss-3.13.5/mozilla/nsprpub/config/rules.mk 2008-12-03
00:24:39.000000000 +0100
++++ misc/build/nss-3.13.5/mozilla/nsprpub/config/rules.mk 2009-11-27
13:36:22.662753328 +0100
+@@ -415,7 +415,7 @@
+
+ ifdef NEED_ABSOLUTE_PATH
+ # The quotes allow absolute paths to contain spaces.
+-pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter
/%,$(1)),$(1),$(CURDIR)/$(1)))"
++pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath
-m $(1))),$(1),$(shell cygpath -m $(CURDIR)/$(1))))"
+ endif
+
+ $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
