Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

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>
Anton Kolesov 11 years ago
parent
a30b868de6
commit
da2f182237
10 changed files with 16 additions and 0 deletions
Unified View Show Diff Stats
  1. 1 0
      package/cairo/Config.in
  2. 2 0
      package/efl/libevas-generic-loaders/Config.in
  3. 1 0
      package/gstreamer/gst-plugins-good/Config.in
  4. 1 0
      package/gstreamer1/gst1-plugins-good/Config.in
  5. 2 0
      package/libgtk2/Config.in
  6. 2 0
      package/librsvg/Config.in
  7. 1 0
      package/libsvg-cairo/Config.in
  8. 2 0
      package/pango/Config.in
  9. 2 0
      package/webkit/Config.in
  10. 2 0
      package/weston/Config.in

+ 1 - 0
package/cairo/Config.in
View File 

@@ -1,5 +1,6 @@
 
 config BR2_PACKAGE_CAIRO
 
 config BR2_PACKAGE_CAIRO
 
 	bool "cairo"
 
 	bool "cairo"
 
+	depends on BR2_ARCH_HAS_ATOMICS
 
 	select BR2_PACKAGE_PIXMAN
 
 	select BR2_PACKAGE_PIXMAN
 
 	select BR2_PACKAGE_FONTCONFIG
 
 	select BR2_PACKAGE_FONTCONFIG
 
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7

+ 2 - 0
package/efl/libevas-generic-loaders/Config.in
View File 

@@ -17,10 +17,12 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
 
 	depends on BR2_USE_WCHAR # librsvg -> glib2
 
 	depends on BR2_USE_WCHAR # librsvg -> glib2
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
 
 	depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
 
 	depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	help
 
 	help
 
 	  This option enables the Evas generic SVG loader
 
 	  This option enables the Evas generic SVG loader
 
 
 
 comment "SVG loader needs a toolchain w/ wchar, threads, C++"
 
 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
 
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
 
 
 endif
 
 endif

+ 1 - 0
package/gstreamer/gst-plugins-good/Config.in
View File 

@@ -178,6 +178,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX
 
 
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO
 
 	bool "cairo"
 
 	bool "cairo"
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO_PNG
 
 	select BR2_PACKAGE_CAIRO_PNG

+ 1 - 0
package/gstreamer1/gst1-plugins-good/Config.in
View File 

@@ -278,6 +278,7 @@ comment "v4l2 needs toolchain w/ headers >= 3.0"
 
 
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO
 
 	bool "cairo"
 
 	bool "cairo"
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO_PNG
 
 	select BR2_PACKAGE_CAIRO_PNG
 
 	help
 
 	help

+ 2 - 0
package/libgtk2/Config.in
View File 

@@ -17,6 +17,7 @@ config BR2_PACKAGE_LIBGTK2
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 
 	depends on BR2_USE_MMU # glib2
 
 	depends on BR2_USE_MMU # glib2
 
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	help
 
 	help
 
 	  The GTK+ version 2 graphical user interface library
 
 	  The GTK+ version 2 graphical user interface library
 
 
 
@@ -34,6 +35,7 @@ endif
 
 
 
 comment "libgtk2 needs a toolchain w/ wchar, threads, C++"
 
 comment "libgtk2 needs a toolchain w/ wchar, threads, C++"
 
 	depends on BR2_USE_MMU
 
 	depends on BR2_USE_MMU
 
+	depends on BR2_ARCH_HAS_ATOMICS
 
 	depends on BR2_PACKAGE_XORG7
 
 	depends on BR2_PACKAGE_XORG7
 
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 
 		!BR2_TOOLCHAIN_HAS_THREADS
 
 		!BR2_TOOLCHAIN_HAS_THREADS

+ 2 - 0
package/librsvg/Config.in
View File 

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

+ 1 - 0
package/libsvg-cairo/Config.in
View File 

@@ -1,5 +1,6 @@
 
 config BR2_PACKAGE_LIBSVG_CAIRO
 
 config BR2_PACKAGE_LIBSVG_CAIRO
 
 	bool "libsvg-cairo"
 
 	bool "libsvg-cairo"
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO_SVG
 
 	select BR2_PACKAGE_CAIRO_SVG
 
 	select BR2_PACKAGE_LIBSVG
 
 	select BR2_PACKAGE_LIBSVG

+ 2 - 0
package/pango/Config.in
View File 

@@ -4,6 +4,7 @@ config BR2_PACKAGE_PANGO
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 
 	depends on BR2_USE_MMU # glib2
 
 	depends on BR2_USE_MMU # glib2
 
 	depends on BR2_INSTALL_LIBSTDCPP # freetype support
 
 	depends on BR2_INSTALL_LIBSTDCPP # freetype support
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	select BR2_PACKAGE_LIBGLIB2
 
 	select BR2_PACKAGE_LIBGLIB2
 
 	select BR2_PACKAGE_EXPAT
 
 	select BR2_PACKAGE_EXPAT
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO
 
@@ -23,5 +24,6 @@ config BR2_PACKAGE_PANGO
 
 
 
 comment "pango needs a toolchain w/ wchar, threads, C++"
 
 comment "pango needs a toolchain w/ wchar, threads, C++"
 
 	depends on BR2_USE_MMU
 
 	depends on BR2_USE_MMU
 
+	depends on BR2_ARCH_HAS_ATOMICS
 
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 
 		!BR2_INSTALL_LIBSTDCPP
 
 		!BR2_INSTALL_LIBSTDCPP

+ 2 - 0
package/webkit/Config.in
View File 

@@ -17,6 +17,7 @@ config BR2_PACKAGE_WEBKIT
 
 	depends on BR2_PACKAGE_LIBGTK2
 
 	depends on BR2_PACKAGE_LIBGTK2
 
 	depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
 
 	depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
 
 	depends on !BR2_BINFMT_FLAT # icu
 
 	depends on !BR2_BINFMT_FLAT # icu
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO
 
 	select BR2_PACKAGE_CAIRO_PNG
 
 	select BR2_PACKAGE_CAIRO_PNG
 
 	select BR2_PACKAGE_ENCHANT
 
 	select BR2_PACKAGE_ENCHANT
 
@@ -44,6 +45,7 @@ config BR2_PACKAGE_WEBKIT
 
 
 
 comment "webkit needs libgtk2 and a toolchain w/ C++, wchar, threads"
 
 comment "webkit needs libgtk2 and a toolchain w/ C++, wchar, threads"
 
 	depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
 
 	depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
 
 	depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
 
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 	depends on BR2_USE_MMU
 
 	depends on BR2_USE_MMU

+ 2 - 0
package/weston/Config.in
View File 

@@ -1,5 +1,6 @@
 
 comment "weston needs udev and a toolchain w/ threads, headers >= 3.0"
 
 comment "weston needs udev and a toolchain w/ threads, headers >= 3.0"
 
 	depends on !BR2_avr32
 
 	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
 
 	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 
 
 
 config BR2_PACKAGE_WESTON
 
 config BR2_PACKAGE_WESTON
 
@@ -15,6 +16,7 @@ config BR2_PACKAGE_WESTON
 
 	depends on !BR2_avr32 # wayland
 
 	depends on !BR2_avr32 # wayland
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 
+	depends on BR2_ARCH_HAS_ATOMICS # cairo
 
 	# Runtime dependency
 
 	# Runtime dependency
 
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
 
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
 
 	# Make sure at least one compositor is selected.
 
 	# Make sure at least one compositor is selected.