ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fdo#69601: quick fix for wrong cli_cppuhelper.dll in instset

Browse Source 
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
This commit is contained in:
Michael Stahl
2013-09-22 22:03:31 +02:00
parent 81202ae748
commit b5fa3764c7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+4 -1
View File
@@ -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 \
solenv/gbuild/platform/com_MSC_class.mk
+1 -1
View File
@@ -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