diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-16 09:17:57 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-16 12:44:20 +0200 |
| commit | bae52ee3ef48d58deb6d7ff312b3f3db20c9c0f2 (patch) | |
| tree | 72e55ea9cd66c111659d722415604c9d35d19724 | |
| parent | c7b883498cb47a7d2a330057dbcd7f74f87a0184 (diff) | |
fix cross-compilation of Galleries
- RepositoryModule_build: add modules necessary to build gengal and
libraries used at run-time
- add dependencies to gb_Executable__register_gengal.bin
- use gb_Helper_OUTDIR_FOR_BUILDLIBDIR
Change-Id: I4a88c1786b1ee2ee2b75b1a5dd75009ef70ed353
| -rw-r--r-- | RepositoryExternal.mk | 17 | ||||
| -rw-r--r-- | RepositoryModule_build.mk | 29 | ||||
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 2 |
3 files changed, 47 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 705aacb965fd..042512f11cde 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2860,8 +2860,25 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\ ) endef +# Better duplication with gb_Gallery__UNO_COMPONENTS than nothing. +# This is used to determine what we need for 'build' platform. define gb_Executable__register_gengal.bin $(call gb_Executable_add_runtime_dependencies,gengal.bin,\ + $(foreach component, \ + comphelper/util/comphelp \ + configmgr/source/configmgr \ + fileaccess/source/fileacc \ + framework/util/fwk \ + i18npool/util/i18npool \ + package/source/xstor/xstor \ + package/util/package2 \ + sfx2/util/sfx \ + svx/util/svx \ + svx/util/svxcore \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ + unoxml/source/service/unoxml \ + ,$(call gb_ComponentTarget_get_outdir_target_for_build,$(component))) \ $(call gb_AllLangResTarget_get_target,ofa) \ $(call gb_Configuration_get_target,registry) \ $(call gb_Configuration_get_target,fcfg_langpack) \ diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 9c24acd21aee..b69d4b48b042 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -63,6 +63,35 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional,CPPUNIT,cppunit) \ $(call gb_Helper_optional_for_host,DESKTOP, \ + $(if $(filter YES,$(WITH_GALLERY_BUILD)), \ + avmedia \ + basebmp \ + basic \ + canvas \ + configmgr \ + cppcanvas \ + drawinglayer \ + editeng \ + fileaccess \ + framework \ + harfbuzz \ + lcms2 \ + linguistic \ + nss \ + package \ + sfx2 \ + sot \ + svl \ + svtools \ + svx \ + toolkit \ + ucb \ + unoxml \ + vcl \ + $(call gb_Helper_optional,VIGRA,vigra) \ + xmloff \ + xmlscript \ + ) \ helpcompiler \ xmlhelp \ ) \ diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 2f330bb47c60..a866a116f8e4 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -51,7 +51,7 @@ define gb_Gallery__make_env_args "-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\ $(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \ $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\ - -env:$(dir)=$(call gb_Helper_make_url,$(gb_Helper_OUTDIRLIBDIR))) + -env:$(dir)=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))) endef define gb_Gallery__command |