Kaydet (Commit) b5fa3764 authored tarafından Michael Stahl's avatar Michael Stahl

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
üst 81202ae7
...@@ -496,8 +496,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ ...@@ -496,8 +496,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
xmlreader \ 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) \ $(if $(filter MSC,$(COM)),cli_cppuhelper) \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(if $(filter MSC,$(COM)),cli_uno) \ $(if $(filter MSC,$(COM)),cli_uno) \
getuid \ getuid \
jpipe \ jpipe \
......
...@@ -544,7 +544,7 @@ gb_InstallScript_EXT := .inf ...@@ -544,7 +544,7 @@ gb_InstallScript_EXT := .inf
# CliAssemblyTarget class # CliAssemblyTarget class
gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT) 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 # Extension class
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment