extensions/StaticLibrary_plugcon.mk | 8 ++++++++ 1 file changed, 8 insertions(+)
New commits: commit dabe10eb94fda61ec39932548c4279611b057658 Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Thu Apr 25 15:35:38 2013 +0200 workaround race condition with mixing internal/system cairo libs http://lists.freedesktop.org/archives/libreoffice/2013-April/051026.html Change-Id: I81031d8290efcc4f343af7bdffb4762411f4f107 diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 3cc8ba1..deb62a8 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -52,6 +52,14 @@ $(eval $(call gb_StaticLibrary_add_defs,plugcon,\ )) $(eval $(call gb_StaticLibrary_use_external,plugcon,gtk)) + +# Gtk uses cairo, and if we build internal cairo, the linker could +# pick up our cairo libs before they're fully ready, causing problems +# (e.g. using our libpixman and system libcairo). Depend on cairo +# to delay build until cairo is done. +ifeq ($(SYSTEM_CAIRO),NO) +$(eval $(call gb_StaticLibrary_use_external,plugcon,cairo)) +endif endif # ENABLE_GTK=TRUE $(eval $(call gb_StaticLibrary_add_exception_objects,plugcon,\
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits