mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to fix gengal dependencies

Browse Source 
The component files are not necessary as gb_Executable__register_gengal
already adds the service.rdb; the gengal.rc is insufficient as that file
references fundamental.rc which is missing, so depend on the Package
instead.  Also, INSTDIR is wrong for cross-compile.

Change-Id: I30711a51e04539832657a242d2573c626b1cf8ec
This commit is contained in:
Michael Stahl 2015-11-27 11:40:16 +01:00
parent 2ebca292f9
commit d764100d62
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RepositoryExternal.mk
View File

@ -3755,6 +3755,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
$(call gb_Package_get_target_for_build,instsetoo_native_setup) \
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,offapi) \

6
solenv/gbuild/Gallery.mk
View File

@ -68,11 +68,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_Gallery_get_target,%) : \
$(call gb_Executable_get_runtime_dependencies,gengal) \
$(INSTROOT)/$(LIBO_ETC_FOLDER)/services/services.rdb \
$(INSTROOT)/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,gengal) \
$(call gb_ComponentTarget_get_target,ucb/source/core/ucb1) \
$(call gb_ComponentTarget_get_target,ucb/source/ucp/file/ucpfile1)
$(call gb_Executable_get_runtime_dependencies,gengal)
$(call gb_Gallery__command,$@,$*)
$(call gb_Gallery__get_final_target,%) :