Repository.mk | 5 ++++-
solenv/gbuild/platform/com_MSC_class.mk | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b5fa3764c74047cbee4b825195a8f3b94ba15ffd
Author: Michael Stahl <mst...@redhat.com>
Date: Sun Sep 22 21:57:18 2013 +0200
fdo#69601: quick fix for wrong cli_cppuhelper.dll in instset
This needs more investigation to find proper solution but the problem is
probably that URE/bin/cli_cppuhelper.dll is not signed by "sn.exe".
Change-Id: I318293603be838c41d09791136697de74091d37d
diff --git a/Repository.mk b/Repository.mk
index 57c8554..aaca80a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -496,8 +496,11 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
xmlreader \
))
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+# FIXME fdo#69601
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(if $(filter MSC,$(COM)),cli_cppuhelper) \
+))
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(if $(filter MSC,$(COM)),cli_uno) \
getuid \
jpipe \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 2269d33..026e775 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -544,7 +544,7 @@ gb_InstallScript_EXT := .inf
# CliAssemblyTarget class
gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT)
-gb_CliAssemblyTarget_get_dll = $(call
gb_Library__get_dir_for_layer,URELIB)/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
+gb_CliAssemblyTarget_get_dll = $(call
gb_Library__get_dir_for_layer,NONE)/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
# Extension class
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
