cairo: add dependency on atomic operations

This fixes:
http://autobuild.buildroot.net/results/fadfaa9916724d310d0dda555a1db31bee1601d0/

Signed-off-by: Anton Kolesov <Anton.Kolesov@synopsys.com>
[yann.morin.1998@free.fr: use the new symbol; remove comment strings;
 fix weston's comment]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 0c87a2904b286aa6532a734489629298aa469537..38570d6f4c0169dc1408291c775c2c3607318fde 100644 (file)
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -1,5 +1,6 @@
 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

diff --git a/package/efl/libevas-generic-loaders/Config.in b/package/efl/libevas-generic-loaders/Config.in
index 23b9f77e8b2f0eac2407d125eeb9433b9c75d2a1..30fb88b38383868fc88f2c00bc965620c4975a87 100644 (file)
--- a/package/efl/libevas-generic-loaders/Config.in
+++ b/package/efl/libevas-generic-loaders/Config.in
@@ -17,10 +17,12 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
        depends on BR2_USE_WCHAR # librsvg -> glib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
        depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        help
          This option enables the Evas generic SVG loader
 
 comment "SVG loader needs a toolchain w/ wchar, threads, C++"
+       depends on BR2_ARCH_HAS_ATOMICS
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
 endif

diff --git a/package/gstreamer/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in
index 3ec93cfa10bb7ccf3ac97038f3356e22650b61e0..36b15a8c0164d9792233a1e48ae671bad9b9618c 100644 (file)
--- a/package/gstreamer/gst-plugins-good/Config.in
+++ b/package/gstreamer/gst-plugins-good/Config.in
@@ -178,6 +178,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO
        bool "cairo"
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        select BR2_PACKAGE_CAIRO
        select BR2_PACKAGE_CAIRO_PNG
 

diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 65dc7b177f665c54c8714b2458fb3b4a4d4fe0cd..f44690cd908d5ba6af1cb8edf32c02538c62d139 100644 (file)
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -278,6 +278,7 @@ comment "v4l2 needs toolchain w/ headers >= 3.0"
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO
        bool "cairo"
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        select BR2_PACKAGE_CAIRO
        select BR2_PACKAGE_CAIRO_PNG
        help

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 5239c25ddf316833787772c440e91b3873b9eba7..9326f442099ec4366c20d093e639dd2848f0cc7b 100644 (file)
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -17,6 +17,7 @@ config BR2_PACKAGE_LIBGTK2
        depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_USE_MMU # glib2
        depends on BR2_INSTALL_LIBSTDCPP # pango
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        help
          The GTK+ version 2 graphical user interface library
 
@@ -34,6 +35,7 @@ endif
 
 comment "libgtk2 needs a toolchain w/ wchar, threads, C++"
        depends on BR2_USE_MMU
+       depends on BR2_ARCH_HAS_ATOMICS
        depends on BR2_PACKAGE_XORG7
        depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
                !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index 5dd4c58124c54c39a6d4fa829ef1c452bb03f608..94ef2eda41e75f98147eaeac9b57c2f203eaa20c 100644 (file)
--- a/package/librsvg/Config.in
+++ b/package/librsvg/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_LIBRSVG
        depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_USE_MMU # glib2
        depends on BR2_INSTALL_LIBSTDCPP # pango
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        help
          The rsvg library is an efficient renderer for Scalable
          Vector Graphics (SVG) pictures.
@@ -18,4 +19,5 @@ config BR2_PACKAGE_LIBRSVG
 
 comment "librsvg needs a toolchain w/ wchar, threads, C++"
        depends on BR2_USE_MMU
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP

diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in
index 9577c69bf0370901b0cb3b153e59eee6b5363b22..d69a6b9259adea322c8893d528163117d24ef49c 100644 (file)
--- a/package/libsvg-cairo/Config.in
+++ b/package/libsvg-cairo/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBSVG_CAIRO
        bool "libsvg-cairo"
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        select BR2_PACKAGE_CAIRO
        select BR2_PACKAGE_CAIRO_SVG
        select BR2_PACKAGE_LIBSVG

diff --git a/package/pango/Config.in b/package/pango/Config.in
index 70f4fd3a8d714c2462aa55cd1ea835af4beac71c..e9c3040b1f045b4d90288ee514d41a32e4b10ecc 100644 (file)
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_PANGO
        depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_USE_MMU # glib2
        depends on BR2_INSTALL_LIBSTDCPP # freetype support
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_EXPAT
        select BR2_PACKAGE_CAIRO
@@ -23,5 +24,6 @@ config BR2_PACKAGE_PANGO
 
 comment "pango needs a toolchain w/ wchar, threads, C++"
        depends on BR2_USE_MMU
+       depends on BR2_ARCH_HAS_ATOMICS
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
                !BR2_INSTALL_LIBSTDCPP

diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 8cd1a36066fb41f21956fb734c80b570e7848779..fcb61b6e79a38f9d6d5d11627ed51ddf06e950af 100644 (file)
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -17,6 +17,7 @@ config BR2_PACKAGE_WEBKIT
        depends on BR2_PACKAGE_LIBGTK2
        depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
        depends on !BR2_BINFMT_FLAT # icu
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        select BR2_PACKAGE_CAIRO
        select BR2_PACKAGE_CAIRO_PNG
        select BR2_PACKAGE_ENCHANT
@@ -44,6 +45,7 @@ config BR2_PACKAGE_WEBKIT
 
 comment "webkit needs libgtk2 and a toolchain w/ C++, wchar, threads"
        depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
                !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU

diff --git a/package/weston/Config.in b/package/weston/Config.in
index aaef405e0fe489904c082c46d25337e870527c31..dc7e23501d493acd9689f3a292a32b3d8d44ea08 100644 (file)
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -1,5 +1,6 @@
 comment "weston needs udev and a toolchain w/ threads, headers >= 3.0"
        depends on !BR2_avr32
+       depends on BR2_ARCH_HAS_ATOMICS
        depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 
 config BR2_PACKAGE_WESTON
@@ -15,6 +16,7 @@ config BR2_PACKAGE_WESTON
        depends on !BR2_avr32 # wayland
        depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
        # Runtime dependency
        select BR2_PACKAGE_XKEYBOARD_CONFIG
        # Make sure at least one compositor is selected.