diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
| commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
| tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/nss/nss-win32-make.patch.1 | |
| parent | Initial commit. (diff) | |
| download | libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip | |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/nss/nss-win32-make.patch.1')
| -rw-r--r-- | external/nss/nss-win32-make.patch.1 | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/external/nss/nss-win32-make.patch.1 b/external/nss/nss-win32-make.patch.1 new file mode 100644 index 000000000..6a3201a08 --- /dev/null +++ b/external/nss/nss-win32-make.patch.1 @@ -0,0 +1,20 @@ +--- nss/nss/coreconf/rules.mk.orig2 2014-06-03 15:30:01.667200000 +0200 ++++ nss/nss/coreconf/rules.mk 2014-06-03 15:30:14.537200000 +0200 +@@ -174,7 +174,7 @@ + $(LIBRARY): $(OBJS) | $$(@D)/d + rm -f $@ + ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) +- $(AR) $(subst /,\\,$(OBJS)) ++ $(AR) $(OBJS) + else + $(AR) cr $@ $(OBJS) + endif +@@ -214,7 +214,7 @@ + ifdef NS_USE_GCC + $(LINK_DLL) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES) + else +- $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)) ++ $(LINK_DLL) -MAP $(DLLBASE) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES) + ifdef MT + if test -f $@.manifest; then \ + $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \ |