RepositoryExternal.mk | 32 +++++++------------------------
external/cairo/ExternalPackage_cairo.mk | 4 ---
external/cairo/ExternalPackage_pixman.mk | 5 ----
external/cairo/ExternalProject_cairo.mk | 8 +------
external/cairo/ExternalProject_pixman.mk | 2 -
5 files changed, 11 insertions(+), 40 deletions(-)
New commits:
commit 1193c331945481dd155a55c6695ff6fd88bd3d10
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Tue Jun 1 19:29:58 2021 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Jun 1 22:12:02 2021 +0200
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 <glo...@fbihome.de>
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),)
diff --git a/external/cairo/ExternalPackage_cairo.mk
b/external/cairo/ExternalPackage_cairo.mk
index 3b78a52fed76..0ae9b39b8ba6 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -12,11 +12,7 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,cairo,cairo))
$(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
ifneq ($(DISABLE_DYNLOADING),TRUE)
-ifneq ($(OS),ANDROID)
-
$(eval $(call
gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.1160$(CAIRO_VERSION_MICRO).0))
-
-endif
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/cairo/ExternalPackage_pixman.mk
b/external/cairo/ExternalPackage_pixman.mk
index 288a9701afda..576517389565 100644
--- a/external/cairo/ExternalPackage_pixman.mk
+++ b/external/cairo/ExternalPackage_pixman.mk
@@ -12,12 +12,7 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,pixman,pixman))
$(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
ifneq ($(DISABLE_DYNLOADING),TRUE)
-ifneq ($(OS),ANDROID)
-
$(eval $(call
gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.34.0))
-
endif
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/cairo/ExternalProject_cairo.mk
b/external/cairo/ExternalProject_cairo.mk
index efb9a2023546..ec3f0d155492 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -12,16 +12,12 @@ $(eval $(call gb_ExternalProject_ExternalProject,cairo))
$(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
$(eval $(call gb_ExternalProject_use_externals,cairo,\
+ fontconfig \
freetype \
libpng \
zlib \
))
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_ExternalProject_use_unpacked,cairo,fontconfig))
-$(eval $(call gb_ExternalProject_use_unpacked,cairo,libpng))
-endif
-
$(eval $(call gb_ExternalProject_register_targets,cairo,\
build \
))
@@ -72,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call
gb_UnpackedTarball_get_dir,freetype)/include") \
$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call
gb_UnpackedTarball_get_dir,fontconfig)") \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if
$(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \
+ $(if $(filter
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(filter EMSCRIPTEN ANDROID iOS,$(OS)),--disable-xlib
--disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib
--disable-xcb,--enable-xlib --enable-xcb)) \
$(if $(filter iOS,$(OS)),--enable-quartz --enable-quartz-font) \
--disable-valgrind \
diff --git a/external/cairo/ExternalProject_pixman.mk
b/external/cairo/ExternalProject_pixman.mk
index 4ecbd0b67416..2c089ba0e5fc 100644
--- a/external/cairo/ExternalProject_pixman.mk
+++ b/external/cairo/ExternalProject_pixman.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) :
$(call gb_Trace_StartRange,pixman,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(gb_RUN_CONFIGURE) ./configure \
- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if
$(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \
+ $(if $(filter
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(filter ANDROID,$(OS)),--disable-arm-simd
--disable-arm-neon --disable-arm-iwmmxt) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM) \
$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
