Commit e64573c4 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

cairo, harfbuzz: rework atomic dependencies 



This commit handles the reverse dependency tree of cairo in terms of
atomic dependencies. There are two main changes:

 - cairo in fact no longer needs atomic operations. It can perfectly
   build without any __sync built-in, as was tested using an ARC
   toolchain without atomics, and a SPARC toolchain. Optionally, Cairo
   can use the __atomic builtins provided by gcc >= 4.7, so support
   for this is added as well. Thanks to this change, the
   BR2_ARCH_HAS_ATOMICS dependency is removed from cairo and all its
   reverse dependencies.

 - harfbuzz does require the __sync built-in for 4 bytes integers, so
   we add a dependency on BR2_TOOLCHAIN_HAS_SYNC_4 to harfbuzz and all
   its reverse dependency, the main one being the pango package. Due
   to this, the vast majority of gtk-related packages are moved to a
   dependency on BR2_ARCH_HAS_ATOMICS (which used to be due to cairo)
   to a dependency on BR2_TOOLCHAIN_HAS_SYNC_4 (due to pango ->
   harfbuzz).

In detail:

 - cairo

   Remove BR2_ARCH_HAS_ATOMICS dependency, link against -latomic when
   gcc >= 4.8 in order to use the __atomic functions.

 - harfbuzz

   Add dependency on BR2_TOOLCHAIN_HAS_SYNC_4

 - cairomm, gst-plugins-good, gst1-plugins-good, libgdiplus,
   libsvg-cairo, weston

   Remove BR2_ARCH_HAS_ATOMICS dependency (since cairo no longer needs
   atomics)

 - enlightenment, cwiid, gst-plugins-bad, gst-plugins-base,
   gst1-plugins-bad, gst1-plugins-base, gtkmm3,
   libevas-generic-loaders, libfm, libgail, libgtk2, libgtk3, librsvg,
   openbox, opencv, opencv3, pango, pangomm, pcmanfm, pinentry,
   rrdtool, webkit, webkitgtk24, xscreensaver

   Switch from a BR2_ARCH_HAS_ATOMICS dependency to a
   BR2_TOOLCHAIN_HAS_SYNC_4 (they depend on pango, harfbuzz, gtk, or
   some other related package)

 - directfb

   Remove BR2_ARCH_ATOMICS dependency of the BR2_PACKAGE_DIRECTFB_SVG
   (since cairo can build without atomics), but add a
   BR2_TOOLCHAIN_HAS_SYNC_4 dependency on BR2_PACKAGE_DIRECTFB itself
   since it does use __sync built-ins. This replaces the !BR2_sparc
   dependency.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent ab73b928

package/cairo/Config.in

+0 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_CAIRO

	bool "cairo"

	depends on BR2_ARCH_HAS_ATOMICS

	select BR2_PACKAGE_PIXMAN

	select BR2_PACKAGE_FONTCONFIG

	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7

package/cairo/cairo.mk

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) 
CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1"

endif



# cairo can use C++11 atomics when available, so we need to link with

# libatomic for the architectures who need libatomic.

ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),y)

CAIRO_CONF_ENV += LIBS="-latomic"

endif



CAIRO_CONF_OPTS = \

	--enable-trace=no \

	--enable-interpreter=no

package/cairomm/Config.in

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CAIROMM 
	select BR2_PACKAGE_CAIRO

	select BR2_PACKAGE_LIBGLIB2

	select BR2_PACKAGE_LIBSIGC

	depends on BR2_ARCH_HAS_ATOMICS # cairo

	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11

	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2

	depends on BR2_USE_WCHAR # libglib2
@@ -16,6 +15,5 @@ config BR2_PACKAGE_CAIROMM 


comment "cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8"

	depends on BR2_USE_MMU

	depends on BR2_ARCH_HAS_ATOMICS

	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \

		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP

package/cwiid/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ config BR2_PACKAGE_CWIID 
if BR2_PACKAGE_CWIID

config BR2_PACKAGE_CWIID_WMGUI

	bool "wmgui"

	depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo

	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3 -> pango -> harfbuzz

	depends on BR2_PACKAGE_XORG7 # libgtk2

	depends on BR2_USE_WCHAR # libgtk2 -> libglib2

	depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2

package/directfb/Config.in

+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config BR2_PACKAGE_DIRECTFB 
	depends on BR2_INSTALL_LIBSTDCPP

	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5

	depends on !BR2_TOOLCHAIN_USES_MUSL # sigval_t issue

	depends on !BR2_sparc # needs atomic operation __sync_fetch_and_add

	depends on BR2_TOOLCHAIN_HAS_SYNC_4

	select BR2_PACKAGE_FREETYPE

	select BR2_PACKAGE_ZLIB

	help
@@ -147,7 +147,6 @@ config BR2_PACKAGE_DIRECTFB_PNG 


config BR2_PACKAGE_DIRECTFB_SVG

	bool "enable SVG support"

	depends on BR2_ARCH_HAS_ATOMICS # cairo

	default y

	select BR2_PACKAGE_LIBSVG_CAIRO
@@ -163,6 +162,6 @@ config BR2_PACKAGE_DIRECTFB_TESTS 
endif # BR2_PACKAGE_DIRECTFB



comment "directfb needs a (e)glibc or uClibc toolchain w/ C++, threads, gcc >= 4.5"

	depends on !BR2_sparc # needs atomic operation __sync_fetch_and_add

	depends on BR2_TOOLCHAIN_HAS_SYNC_4

	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \

		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL