diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-22 21:57:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 22:03:31 +0200 |
| commit | b5fa3764c74047cbee4b825195a8f3b94ba15ffd (patch) | |
| tree | 9df12a1ea8aac49f78e398a6f2a6fa35d87f6946 | |
| parent | 81202ae7487b139cb473ff85634003b36d67e8c4 (diff) | |
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
| -rw-r--r-- | Repository.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index 57c855460f15..aaca80a53f56 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 2269d33ddd9e..026e77559ec9 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 |