diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:15:13 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:26:20 -0600 |
| commit | 55df380f008851af859970bfb88942b8872f9cda (patch) | |
| tree | 7896b02e186deac342c09aaa12f201de9a2a5526 /external/nss/nss.windows.patch | |
| parent | 11d41e980a5e2d5a4f75183af422a99a79692fc4 (diff) | |
fdo#70393: move nss to a subdir of external
Change-Id: Ibbeb6b284c6c5fb9bba4ad52abed69321bba90d8
Reviewed-on: https://gerrit.libreoffice.org/6545
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/nss/nss.windows.patch')
| -rw-r--r-- | external/nss/nss.windows.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/external/nss/nss.windows.patch b/external/nss/nss.windows.patch new file mode 100644 index 000000000000..0d4ce1b5baea --- /dev/null +++ b/external/nss/nss.windows.patch @@ -0,0 +1,22 @@ +--- 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 +--- misc/nss-3.13.5/mozilla/security/coreconf/rules.mk 2008-12-03 00:24:39.000000000 +0100 ++++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk 2009-11-27 13:36:22.662753328 +0100 +@@ -411,7 +411,7 @@ + endif + + # The quotes allow absolute paths to contain spaces. +-core_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))" ++core_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(PWD)/$(1))))" + + $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c + @$(MAKE_OBJDIR) |