diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-01 19:29:58 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-01 22:12:02 +0200 |
| commit | 1193c331945481dd155a55c6695ff6fd88bd3d10 (patch) | |
| tree | 0c87653c939544d282566a64283b7ba19cc9218a /RepositoryExternal.mk | |
| parent | 017bc462b0af467ca89653266674302a9821db5e (diff) | |
cairo: just register and use external fontconfig
Except for the pixman include, the ANDROID cairo external is the
same then the other OS use. It also builds fontconfig, so there
is really no need to depend on the source (ok, this way it can
be a bit more parallel, if nothing is generated). But the build
nevertheless always sets includes for fontconfig anyway. And the
code implied you can build Android without --disable-dynloading.
Change-Id: I9970dc5c052b6fa80588233244c6828079d8277e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116554
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2c1bf9c7d79f..df4a8f15c703 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1272,9 +1272,6 @@ endif # ANDROID endif # SYSTEM_REDLAND - -ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS)$(DISABLE_GUI),) # or - ifneq ($(SYSTEM_CAIRO),) define gb_LinkTarget__use_cairo @@ -1311,27 +1308,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -endif # SYSTEM_CAIRO - -else ifeq ($(OS),ANDROID) - -define gb_LinkTarget__use_cairo -$(call gb_LinkTarget_use_package,$(1),cairo) -$(call gb_LinkTarget_use_package,$(1),pixman) -$(call gb_LinkTarget_use_external,$(1),freetype_headers) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,cairo) \ - -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ - $$(INCLUDE) \ -) -$(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \ - -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \ -) - -endef - -endif # CAIRO +endif # !SYSTEM_CAIRO ifneq ($(SYSTEM_FREETYPE),) @@ -1381,6 +1358,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS)) endef +gb_ExternalProject__use_fontconfig := + else define gb_LinkTarget__use_fontconfig @@ -1396,6 +1375,11 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +define gb_ExternalProject__use_fontconfig +$(call gb_ExternalProject_use_external_project,$(1),fontconfig) + +endef + endif # SYSTEM_FONTCONFIG ifneq ($(SYSTEM_GRAPHITE),) |