diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-25 15:35:38 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-25 15:35:38 +0200 |
| commit | dabe10eb94fda61ec39932548c4279611b057658 (patch) | |
| tree | a6e6820644da786e9286d7ef4fc24b9e26b016db /extensions | |
| parent | b1fc17ea25a6c6b0e451d6a1fd420a32ec0369e6 (diff) | |
workaround race condition with mixing internal/system cairo libs
http://lists.freedesktop.org/archives/libreoffice/2013-April/051026.html
Change-Id: I81031d8290efcc4f343af7bdffb4762411f4f107
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/StaticLibrary_plugcon.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 3cc8ba15cc33..deb62a834a36 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,\ |