libglib2: needs threads

This commit adds a dependency of the libglib2 package on thread
support in the toolchain, since upstream libglib2 doesn't build
without thread support. The commit is rather large as it involves
propagating the dependency on thread support to all reverse
dependencies of the libglib2 package.

[Thomas: squash all patches into one, make a few minor fixes, the most
important one being to not add comments about MMU requirement when a
package doesn't work on !MMU platforms.]

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>

diff --git a/package/atk/Config.in b/package/atk/Config.in
index 928fae7463de21dd64880ebb65d36341fa871793..7dec8b89fe5f1170f322a7a5e801e5426b6e8026 100644 (file)
--- a/package/atk/Config.in
+++ b/package/atk/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_ATK
        bool "atk"
        select BR2_PACKAGE_LIBGLIB2
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        help
          The ATK accessibility toolkit, needed to build GTK+-2.x.
 
-comment "atk requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "atk requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 72b900c38e8d8aef28394ff953ed79d760c8f604..570ba752556cb445823af38c7a42c104ab34cebb 100644 (file)
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_BLUEZ_UTILS
        bool "bluez-utils"
        depends on !BR2_avr32
        depends on BR2_USE_WCHAR # libglib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_LIBGLIB2
@@ -38,5 +38,5 @@ config BR2_PACKAGE_BLUEZ_UTILS_USB
 
 endif
 
-comment "bluez-utils require a toolchain with WCHAR and thread support"
+comment "bluez-utils require a toolchain with WCHAR and threading support"
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/bustle/Config.in b/package/bustle/Config.in
index 2a2a2c1d682af8dae82cb67f1b5b202fba0e6726..704165ddfadc1d4bf20a416977f936bc7bb54cc4 100644 (file)
--- a/package/bustle/Config.in
+++ b/package/bustle/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_BUSTLE
        select BR2_PACKAGE_LIBPCAP
        select BR2_PACKAGE_LIBGLIB2
        depends on BR2_USE_WCHAR # libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        depends on BR2_PACKAGE_DBUS # runtime
        help
          Bustle is a better dbus-monitor! It records and draws
@@ -18,5 +19,5 @@ config BR2_PACKAGE_BUSTLE
 
          http://www.willthompson.co.uk/bustle/
 
-comment "bustle requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "bustle requires a toolchain with WCHAR support and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/connman/Config.in b/package/connman/Config.in
index e0505b312568212f242eb1c494900d4fb4f89ea2..0853941d4d0b5aefcabe707bc42b4c89318a1bb4 100644 (file)
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_CONNMAN
        depends on !BR2_UCLIBC_VERSION_0_9_32
        depends on BR2_USE_WCHAR # libglib2 and gnutls
        depends on BR2_INET_IPV6
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus
        help
          The Connection Manager (ConnMan) project provides a daemon for
@@ -49,6 +49,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 
 endif # BR2_PACKAGE_CONNMAN
 
-comment "connman needs a toolchain with IPv6, WCHAR, thread and resolver support"
+comment "connman needs a toolchain with IPv6, WCHAR, threading and resolver support"
        depends on BR2_UCLIBC_VERSION_0_9_32 || \
                !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
index 0d8e715a5e4a320b83f06189bf9476df2db29bad..ac527da213dc71384aedd548bccc28c7937c6f22 100644 (file)
--- a/package/curlftpfs/Config.in
+++ b/package/curlftpfs/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_CURLFTPFS
        select BR2_PACKAGE_LIBCURL
        depends on BR2_LARGEFILE
        depends on BR2_USE_WCHAR # glib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
        depends on BR2_USE_MMU # libfuse
        depends on !BR2_PREFER_STATIC_LIB # libfuse
        help
@@ -17,5 +17,5 @@ config BR2_PACKAGE_CURLFTPFS
 
          http://curlftpfs.sourceforge.net/
 
-comment "curlftpfs requires a toolchain with LARGEFILE, WCHAR, threads and dynamic library support"
+comment "curlftpfs requires a toolchain with LARGEFILE, WCHAR, threading and dynamic library support"
        depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
index f1dab43924e90d71fbf794456dcc1c75926ac13f..b019b34383a1e2dc81f313e1dd0b65716f082e2c 100644 (file)
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -2,11 +2,13 @@ config BR2_PACKAGE_DBUS_GLIB
        bool "dbus-glib"
        depends on BR2_PACKAGE_DBUS
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        help
          GLib bindings for D-Bus.
 
          http://www.freedesktop.org/software/dbus
 
-comment "dbus-glib requires a toolchain with WCHAR support"
-       depends on BR2_PACKAGE_DBUS && !BR2_USE_WCHAR
+comment "dbus-glib requires a toolchain with WCHAR and threading support"
+       depends on BR2_PACKAGE_DBUS && \
+               (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index 91c127d05f48facc17694d0b1d69c512137e0680..61e81e7fde020d14f38cd599b49557c260c13bf4 100644 (file)
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DBUS_PYTHON
        bool "dbus-python"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_PACKAGE_DBUS
        depends on BR2_PACKAGE_PYTHON
        select BR2_PACKAGE_DBUS_GLIB
@@ -9,5 +10,6 @@ config BR2_PACKAGE_DBUS_PYTHON
 
          http://dbus.freedesktop.org/doc/dbus-python/
 
-comment "dbus-python requires a toolchain with WCHAR support"
-       depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && !BR2_USE_WCHAR
+comment "dbus-python requires a toolchain with WCHAR and threading support"
+       depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && \
+               (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/docker/Config.in b/package/docker/Config.in
index f07739a21afa5f311c5659aee33fb1dc887eca82..866ffcf8298d724d577f836dc7a9b3c52be5b1b4 100644 (file)
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DOCKER
        bool "docker"
        depends on BR2_PACKAGE_XORG7
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_XLIB_LIBX11
        help
@@ -9,5 +10,6 @@ config BR2_PACKAGE_DOCKER
 
          http://icculus.org/openbox/2/docker
 
-comment "docker requires a toolchain with WCHAR support"
-       depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR
+comment "docker requires a toolchain with WCHAR and threading support"
+       depends on BR2_PACKAGE_XORG7 && \
+               (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 64b001e9b2b0f135da497e29bbe2bdaf76a32fa1..31a3b037407489926b07bf9fe17c3c9d2f12a3de 100644 (file)
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -17,10 +17,15 @@ if BR2_PACKAGE_LIBEDBUS
 config BR2_PACKAGE_LIBEDBUS_BLUEZ
        bool "bluez support"
        depends on !BR2_avr32 # bluez_utils
+       depends on BR2_USE_WCHAR # bluez_utils -> glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> glib2
        select BR2_PACKAGE_BLUEZ_UTILS
        help
          Bluetooth support.
 
+comment "bluez support requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_LIBEDBUS_CONNMAN
        bool "connman support"
        depends on BR2_PACKAGE_CONNMAN

diff --git a/package/efl/libevas-generic-loaders/Config.in b/package/efl/libevas-generic-loaders/Config.in
index bfa6097622057a085e10a65d942ed0d6f3ae4b9b..53637944bc5cec7491b7684d25297291cf092f0d 100644 (file)
--- a/package/efl/libevas-generic-loaders/Config.in
+++ b/package/efl/libevas-generic-loaders/Config.in
@@ -15,11 +15,12 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
        select BR2_PACKAGE_LIBRSVG
        select BR2_PACKAGE_CAIRO
        depends on BR2_USE_WCHAR # librsvg -> glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
        depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
        help
          This option enables the Evas generic SVG loader
 
-comment "SVG loader requires a toolchain with WCHAR and C++ support"
-       depends on !BR2_USE_WCHAR && !BR2_INSTALL_LIBSTDCPP
+comment "SVG loader requires a toolchain with WCHAR, threading and C++ support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
 endif

diff --git a/package/enchant/Config.in b/package/enchant/Config.in
index 33f36db41b69ee68fd090cce73118081822b437b..783c73ea0dd59dc552889c2dac5ff8fbb0c6a95c 100644 (file)
--- a/package/enchant/Config.in
+++ b/package/enchant/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_ENCHANT
        bool "enchant"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        help
          Enchant is a spell-checking library that provides a consistent
@@ -9,5 +10,6 @@ config BR2_PACKAGE_ENCHANT
 
          http://www.abisource.com/projects/enchant/
 
-comment "enchant requires a toolchain with C++ and WCHAR support enabled"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "enchant requires a toolchain with C++, threading and WCHAR support enabled"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 357c72b9dc81a6baadf7ab098429ccb79b695cbc..f86f271a8c7ac3d13f955eb51c6fad39d1eb4ae4 100644 (file)
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -21,6 +21,7 @@ config BR2_PACKAGE_ENLIGHTENMENT
        depends on BR2_USE_WCHAR
        depends on BR2_INSTALL_LIBSTDCPP
        # libedbus -> dbus
+       # libedbus -> glib2
        depends on BR2_TOOLCHAIN_HAS_THREADS
        # libedbus -> dbus
        depends on BR2_USE_MMU

diff --git a/package/gamin/Config.in b/package/gamin/Config.in
index 3ede2e4d760e5f6968604fa7c9bf65bc32219209..369c10e6f15a6dfd1fda4756f930fd8587dce115 100644 (file)
--- a/package/gamin/Config.in
+++ b/package/gamin/Config.in
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_GAMIN
        bool "gamin"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        help
          the File Alteration Monitor
 
          http://www.gnome.org/~veillard/gamin/sources
 
-comment "gamin requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "gamin requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 33b5f7c86256bc2d7df919b3139a1b8bbdff9201..05de93416f970c9fe325743740830c64582ebac2 100644 (file)
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GDK_PIXBUF
        bool "gdk-pixbuf"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
@@ -9,3 +10,6 @@ config BR2_PACKAGE_GDK_PIXBUF
          and the GLib, to integrate well with GNOME applications.
 
          http://www.gtk.org/
+
+comment "gdk-pixbuf depends on toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
index dab35eaba2dc387eb9de726368c78fa730e5295f..8d106f5632f8bed5a96ba01c4a32cd9a9630549f 100644 (file)
--- a/package/glib-networking/Config.in
+++ b/package/glib-networking/Config.in
@@ -1,10 +1,11 @@
 config BR2_PACKAGE_GLIB_NETWORKING
        bool "glib-networking"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        help
          Network-related GIO modules for glib.
 
-comment "glib-networking requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "glib-networking requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in
index cd4ac01fa11e424236619ac7be321fe01b74094b..fddd5e4258b756f7d9a530d8a535b67029262a56 100644 (file)
--- a/package/glibmm/Config.in
+++ b/package/glibmm/Config.in
@@ -3,11 +3,13 @@ config BR2_PACKAGE_GLIBMM
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_LIBSIGC
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_USE_WCHAR
+       depends on BR2_USE_WCHAR # libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        help
          The GLibmm package is a set of C++ bindings for GLib.
 
          http://www.gtkmm.org/
 
-comment "glibmm requires a toolchain with C++ & WCHAR support enabled"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "glibmm requires a toolchain with C++, WCHAR, and threading support"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 9b38d1a4f089a16fe9eba331932217625ed3c372..96dc58f7865086771dd91d20a2988865a69af1e2 100644 (file)
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GMPC
        bool "gmpc"
        depends on BR2_PACKAGE_LIBGTK2
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_PACKAGE_XORG7
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
@@ -19,5 +20,6 @@ config BR2_PACKAGE_GMPC
 
          http://gmpcwiki.sarine.nl/index.php?title=GMPC
 
-comment "gmpc requires a toolchain with WCHAR support"
-       depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR
+comment "gmpc requires a toolchain with WCHAR and threading support"
+       depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/gob2/Config.in b/package/gob2/Config.in
index 4a09c4191762b83cec7c9961e567801e8f12677b..d795335eb19c58a2c7f20ed30aea2d258d4aaf30 100644 (file)
--- a/package/gob2/Config.in
+++ b/package/gob2/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GOB2
        bool "gob2"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        # m4 uses fork(), so does bison then
        depends on BR2_USE_MMU
        select BR2_PACKAGE_LIBGLIB2
@@ -13,4 +14,4 @@ config BR2_PACKAGE_GOB2
          http://www.jirka.org/gob.html
 
 comment "gob2 requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index e0a945e7f5a477b42d5156e7afc9a519792a4a92..63c4996c6c5a2e86c1906af935bbe84553256c7a 100644 (file)
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_GVFS
        depends on BR2_LARGEFILE
        depends on BR2_USE_WCHAR # glib2
        depends on BR2_USE_MMU # dbus
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_SHARED_MIME_INFO
@@ -16,5 +16,5 @@ config BR2_PACKAGE_GVFS
 
          http://en.wikipedia.org/wiki/GVFS
 
-comment "gvfs requires a toolchain with LARGEFILE and WCHAR support"
-       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+comment "gvfs requires a toolchain with LARGEFILE, WCHAR and threading support"
+       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/json-glib/Config.in b/package/json-glib/Config.in
index 3ebc76db27351fc947909281b7506e5e1ca8c81a..db2538616a2c4caa555e7731e22a5be2fe7d8f31 100644 (file)
--- a/package/json-glib/Config.in
+++ b/package/json-glib/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_JSON_GLIB
        bool "json-glib"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_JSON_GLIB
 
          https://live.gnome.org/JsonGlib/
 
-comment "json-glib requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "json-glib requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/latencytop/Config.in b/package/latencytop/Config.in
index 12176c0cb5be11d909949163a27ae9e473bfb68e..23e4c63bb6de49d32c73f8845613bc59734ca360 100644 (file)
--- a/package/latencytop/Config.in
+++ b/package/latencytop/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LATENCYTOP
        bool "latencytop"
-       depends on BR2_USE_WCHAR
+       depends on BR2_USE_WCHAR # libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        select BR2_PACKAGE_NCURSES
        select BR2_PACKAGE_LIBGLIB2
        help
@@ -19,5 +20,5 @@ config BR2_PACKAGE_LATENCYTOP
 
          http://www.latencytop.org
 
-comment "latencytop requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "latencytop requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/libgail/Config.in b/package/libgail/Config.in
index ba747953b4d0bd43d2a97119a494e0bbf891b4a0..3e1af628a76bb4eaef77388b9506b4ed8b4efd3a 100644 (file)
--- a/package/libgail/Config.in
+++ b/package/libgail/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBGAIL
        bool "libgail"
+       depends on BR2_USE_WCHAR # pango -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
        depends on BR2_PACKAGE_LIBGTK2
        select BR2_PACKAGE_PANGO
        help
@@ -16,3 +18,7 @@ config BR2_PACKAGE_LIBGAIL
          program.
 
          http://developer.gnome.org/projects/gap
+
+comment "libgail requires a toolchain with WCHAR and threading support"
+       depends on BR2_PACKAGE_LIBGTK2 && \
+               (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/libglade/Config.in b/package/libglade/Config.in
index f7a9a1ce09b487377d6693e769f509ca3c6a7435..d0425170e7683bbc11d8da8bfa934edc45181a6f 100644 (file)
--- a/package/libglade/Config.in
+++ b/package/libglade/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBGLADE
        bool "libglade"
        depends on BR2_PACKAGE_LIBGTK2
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_ATK
        select BR2_PACKAGE_LIBXML2
@@ -12,5 +13,6 @@ config BR2_PACKAGE_LIBGLADE
 
          http://ftp.gnome.org/pub/GNOME/sources/libglade/
 
-comment "libglade requires a toolchain with WCHAR support"
-       depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR
+comment "libglade requires a toolchain with WCHAR and threading support"
+       depends on BR2_PACKAGE_LIBGTK2 && \
+               (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 5282885b8b6ef6a5f3ad44ea8a397de24555d673..806dbbefbe23e456366009b5c0a449b077950220 100644 (file)
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -5,10 +5,11 @@ config BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_LIBFFI
        select BR2_PACKAGE_ZLIB
        depends on BR2_USE_WCHAR # gettext
+       depends on BR2_TOOLCHAIN_HAS_THREADS
        help
          Low-level core library that forms the basis of GTK+ and GNOME.
 
          http://www.gtk.org/
 
-comment "libglib2 requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "libglib2 requires a toolchain with WCHAR support and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch b/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch
deleted file mode 100644 (file)
index 43c7e16..0000000
--- a/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix gio/gcancellable.c build when thread support is disabled
-
-Changes:
-       Updated for 2.36.1
-
-Signed-off-by: "Samuel Martin" <s.martin49@gmail.com>
-Signed-off-by: "Spenser Gilliland" <spenser@gillilanding.com>
----
---- libglib2-2.36.1.orig/gio/gcancellable.c    2013-03-13 08:39:09.000000000 -0500
-+++ libglib2-2.36.1/gio/gcancellable.c 2013-05-26 10:49:32.366019891 -0500
-@@ -267,7 +267,9 @@
-   while (priv->cancelled_running)
-     {
-       priv->cancelled_running_waiting = TRUE;
-+#if defined(G_THREADS_ENABLED)
-       g_cond_wait (&cancellable_cond, &cancellable_mutex);
-+#endif
-     }
- 
-   if (priv->cancelled)
-@@ -620,7 +622,9 @@
-   while (priv->cancelled_running)
-     {
-       priv->cancelled_running_waiting = TRUE;
-+#if defined(G_THREADS_ENABLED)
-       g_cond_wait (&cancellable_cond, &cancellable_mutex);
-+#endif
-     }
- 
-   g_signal_handler_disconnect (cancellable, handler_id);

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 462b0b62397613aba46f883ce2be82f34ada5feb..c280c6afa402d518e3ffcd8f262210c39b983932 100644 (file)
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -14,18 +14,23 @@ config BR2_PACKAGE_LIBGTK2
        select BR2_PACKAGE_XLIB_LIBXRENDER
        depends on BR2_PACKAGE_XORG7
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_INSTALL_LIBSTDCPP # pango
        help
          The GTK+ version 2 graphical user interface library
 
          http://www.gtk.org/
 
+if BR2_PACKAGE_LIBGTK2
+
 config BR2_PACKAGE_LIBGTK2_DEMO
        bool "Install libgtk2 demo program"
-       depends on BR2_PACKAGE_LIBGTK2
        help
          The GTK+ source base contains a gtk-demo program. This
          option allows to install this program to the target.
 
-comment "libgtk2 requires a toolchain with WCHAR and C++ support"
-       depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+endif
+
+comment "libgtk2 requires a toolchain with WCHAR, threading and C++ support"
+       depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+               !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/libmms/Config.in b/package/libmms/Config.in
index 17cb406a62567941688407355e774aaabdfce9c3..3cabbc7714faf41ec89f062fd8ad041d2d032c5a 100644 (file)
--- a/package/libmms/Config.in
+++ b/package/libmms/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBMMS
        bool "libmms"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        help
           LibMMS is a common library for parsing mms:// and mmsh://
@@ -11,5 +12,5 @@ config BR2_PACKAGE_LIBMMS
 
          http://launchpad.net/libmms
 
-comment "libmms requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "libmms requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/libmpd/Config.in b/package/libmpd/Config.in
index 9259c19ee9122f024d0223875749c8308c86b046..7617e88633553864a4346e9c488cb35b39a5cd43 100644 (file)
--- a/package/libmpd/Config.in
+++ b/package/libmpd/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBMPD
        bool "libmpd"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_LIBMPD
 
          http://gmpcwiki.sarine.nl/index.php?title=Libmpd
 
-comment "libmpd requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "libmpd requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index df329011629d3b678549d7468f1b22f52b0f344f..c7de7ba38374645f3e1cde89f82a611966f47754 100644 (file)
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -21,10 +21,11 @@ config BR2_PACKAGE_LIBPLAYER_MPLAYER
 config BR2_PACKAGE_LIBPLAYER_GSTREAMER
        bool "gstreamer backend"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_GSTREAMER
 
-comment "gstreamer backend requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "gstreamer backend requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_LIBPLAYER_PYTHON
        depends on BR2_PACKAGE_PYTHON

diff --git a/package/libqmi/Config.in b/package/libqmi/Config.in
index c5e8a5c37e484d70445d25e7702aaeecf411c283..84842505dcf2988f03d23cec508aa51b7d4fea6b 100644 (file)
--- a/package/libqmi/Config.in
+++ b/package/libqmi/Config.in
@@ -2,8 +2,12 @@ config BR2_PACKAGE_LIBQMI
        bool "libqmi"
        select BR2_PACKAGE_LIBGLIB2
        depends on BR2_USE_WCHAR # libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        help
          libqmi is a glib-based library for talking to WWAN modems and devices
          which speak the Qualcomm MSM Interface (QMI) protocol.
 
          http://www.freedesktop.org/wiki/Software/libqmi/
+
+comment "libqmi requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index b2ef6adf47926c6499235381f895bbb28601a367..ce711f7df57f9461c0d342da2846c6b6ed4d8a2b 100644 (file)
--- a/package/librsvg/Config.in
+++ b/package/librsvg/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBRSVG
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GDK_PIXBUF
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_INSTALL_LIBSTDCPP # pango
        help
          The rsvg library is an efficient renderer for Scalable
@@ -14,5 +15,5 @@ config BR2_PACKAGE_LIBRSVG
 
          http://librsvg.sourceforge.net/
 
-comment "librsvg requires a toolchain with WCHAR and C++ support"
-       depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+comment "librsvg requires a toolchain with WCHAR, threading and C++ support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP

diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 2ed08d933563333047815839611f5898bd1b4da7..b80cb6384eaa7c71d99950742b90bbd22833d7be 100644 (file)
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBSOUP
        bool "libsoup"
        depends on BR2_USE_WCHAR # glib2 and gnutls
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBXML2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
@@ -12,13 +13,16 @@ config BR2_PACKAGE_LIBSOUP
 
          http://live.gnome.org/LibSoup
 
+if BR2_PACKAGE_LIBSOUP
+
 config BR2_PACKAGE_LIBSOUP_SSL
        bool "https support"
        select BR2_PACKAGE_GLIB_NETWORKING
        select BR2_PACKAGE_GNUTLS
-       depends on BR2_PACKAGE_LIBSOUP
        help
          Enable HTTPS (SSL) support.
 
-comment "libsoup requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+endif
+
+comment "libsoup requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/libxmlpp/Config.in b/package/libxmlpp/Config.in
index cf29c2c5c4f1a8fc77e186850c2d770d78eaf8e2..2448bfd9e930399d4edfdc3c53500dcd34360f90 100644 (file)
--- a/package/libxmlpp/Config.in
+++ b/package/libxmlpp/Config.in
@@ -3,11 +3,13 @@ config BR2_PACKAGE_LIBXMLPP
        select BR2_PACKAGE_LIBXML2
        select BR2_PACKAGE_GLIBMM
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_USE_WCHAR
+       depends on BR2_USE_WCHAR # glibmm -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glibmm -> libglib2
        help
          libxml++ is a C++ wrapper for the libxml XML parser library.
 
          http://libxmlplusplus.sourceforge.net/
 
-comment "libxml++ requires a toolchain with C++ & WCHAR support enabled"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "libxml++ requires a toolchain with C++, WCHAR and threading support"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+       !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index 6f47304c15f3a0f36a02c7eb85f41b80d2a0b42a..4f14477ba8731685b1e04bb14ab9bbb41ff42e73 100644 (file)
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -4,9 +4,10 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
        select BR2_PACKAGE_UTIL_LINUX
        select BR2_PACKAGE_UTIL_LINUX_LIBUUID
        select BR2_PACKAGE_LIBGLIB2
-       # libglib2 needs gettext which needs wchar support, and we
-       # also depends on util-linux which needs wchar
+       # libglib2 needs thread support and gettext which needs wchar support, and 
+       # we also depends on util-linux which needs wchar
        depends on BR2_USE_WCHAR
+       depends on BR2_TOOLCHAIN_HAS_THREADS
        # util-linux depends on largefile support
        depends on BR2_LARGEFILE
        help
@@ -26,5 +27,6 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 
          http://lttng.org
 
-comment "lttng-babeltrace needs WCHAR and LARGEFILE support"
-       depends on BR2_PACKAGE_LTTNG_TOOLS && !(BR2_USE_WCHAR || BR2_LARGEFILE)
+comment "lttng-babeltrace needs WCHAR, threading and LARGEFILE support"
+       depends on BR2_PACKAGE_LTTNG_TOOLS && \
+               (!BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/midori/Config.in b/package/midori/Config.in
index 41f451588d214d58a9f222cf8049c33e81390e78..d35874097fda41bbfd87dbf6cc21d30f27f16df8 100644 (file)
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -6,11 +6,13 @@ config BR2_PACKAGE_MIDORI
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        depends on BR2_PACKAGE_LIBGTK2
        depends on BR2_INSTALL_LIBSTDCPP # webkit
+       depends on BR2_TOOLCHAIN_HAS_THREADS # webkit -> enchant -> libglib2
        depends on BR2_USE_WCHAR         # webkit
        help
          Midori is a lightweight web browser based on WebKit
 
          http://software.twotoasts.de/?page=midori
 
-comment "midori requires C++, WCHAR in toolchain and libgtk2"
-        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2
+comment "midori requires C++, WCHAR, threading in toolchain and libgtk2"
+        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2

diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in
index 9a1ae639c7c762538d11bca0479a73c80f8ab9ea..142367b12805b4b9ed205eb5207416d6e6aebf84 100644 (file)
--- a/package/multimedia/gst-plugin-x170/Config.in
+++ b/package/multimedia/gst-plugin-x170/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GST_PLUGIN_X170
        bool "gst-plugin-x170"
        depends on BR2_PACKAGE_GSTREAMER
        depends on BR2_arm926t
+       # glibc toolchain includes WCHAR and threading for libglib2
        depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs
        select BR2_PACKAGE_ON2_8170_LIBS
        help
@@ -9,3 +10,6 @@ config BR2_PACKAGE_GST_PLUGIN_X170
          ATMEL AT91SAM9M10 SoC.
 
          http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
+comment "gst-plugin-x170 requires a toolchain which uses eglibc/glibc"
+       depends on BR2_PACKAGE_GSTREAMER && BR2_arm926t && !BR2_TOOLCHAIN_USES_GLIBC

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 2271036c8400f627594fd53e1c26cc7f21932535..3c5c16198b416ee135f01ea26a2852d13939f9cc 100644 (file)
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -277,8 +277,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
        bool "libmms"
+       depends on BR2_USE_WCHAR # libmms -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2
        select BR2_PACKAGE_LIBMMS
 
+comment "libmms requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK
        bool "musepack"
        select BR2_PACKAGE_MUSEPACK
@@ -294,10 +299,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG
        bool "rsvg"
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_USE_WCHAR # librsvg -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> libglib2
        select BR2_PACKAGE_LIBRSVG
 
-comment "rsvg plugin requires a toolchain with C++ support"
-       depends on !BR2_INSTALL_LIBSTDCPP
+comment "rsvg plugin requires a toolchain with C++, WCHAR, and threading support"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
        bool "sdl"

diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index af4fe8c1e0ac880d7a87479ab08b81d9fdede570..7370bd6b0e5f9faf6ddc08473a0dbc2fce38eacf 100644 (file)
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -86,10 +86,13 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO
        bool "pango font renderer"
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_USE_WCHAR # pango -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
        select BR2_PACKAGE_PANGO
 
-comment "pango plugin requires a toolchain with C++ support"
-       depends on !BR2_INSTALL_LIBSTDCPP
+comment "pango plugin requires a toolchain with C++, WCHAR and threading support "
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA
        bool "theora (*.ogg video)"

diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 978aa0b32801e1c3908974e47ec8252bb03076c8..c604a41a02226c3edee0aa2d8f47c004eb7208c9 100644 (file)
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -188,8 +188,13 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
        bool "gdkpixbuf"
+       depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
        select BR2_PACKAGE_GDK_PIXBUF
 
+comment "gdkpixbuf requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
        bool "ossaudio (OSS audio)"
 
@@ -204,8 +209,13 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
        bool "souphttpsrc (http client)"
+       depends on BR2_USE_WCHAR # libsoup -> glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2
        select BR2_PACKAGE_LIBSOUP
 
+comment "souphttpsrc requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREAD
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX
        bool "speex"
        select BR2_PACKAGE_SPEEX

diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/multimedia/gst1-plugins-bad/Config.in
index 98550e081cbf4a5e8731d8461982a057e9fb0ae4..878bf53991fe44ba694154cf30f1c3a5159c5202 100644 (file)
--- a/package/multimedia/gst1-plugins-bad/Config.in
+++ b/package/multimedia/gst1-plugins-bad/Config.in
@@ -372,10 +372,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
        bool "libmms"
+       depends on BR2_USE_WCHAR # libmms -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2
        select BR2_PACKAGE_LIBMMS
        help
          Microsoft Multi Media Server streaming protocol support
 
+comment "libmms requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREAD
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
        bool "mpeg2enc"
        select BR2_PACKAGE_LIBMPEG2
@@ -417,12 +422,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG
        bool "rsvg"
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_USE_WCHAR # librsvg -> glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
        select BR2_PACKAGE_LIBRSVG
        help
          RSVG plugin library
 
-comment "rsvg plugin requires a toolchain with C++ support"
-       depends on !BR2_INSTALL_LIBSTDCPP
+comment "rsvg plugin requires a toolchain with C++, WCHAR and threading support"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES
        bool "eglgles"

diff --git a/package/multimedia/gst1-plugins-base/Config.in b/package/multimedia/gst1-plugins-base/Config.in
index 10561c13a7185faf634edc6bbe616274a59365a2..e02d23ac8b9320bbd150af928ec0facb122380f2 100644 (file)
--- a/package/multimedia/gst1-plugins-base/Config.in
+++ b/package/multimedia/gst1-plugins-base/Config.in
@@ -130,12 +130,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG
 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO
        bool "pango font renderer"
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_USE_WCHAR # pango -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
        select BR2_PACKAGE_PANGO
        help
          Pango-based text rendering and overlay
 
-comment "pango plugin requires a toolchain with C++ support"
-       depends on !BR2_INSTALL_LIBSTDCPP
+comment "pango plugin requires a toolchain with C++, WCHAR and threading support"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA
        bool "theora (*.ogg video)"

diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/multimedia/gst1-plugins-good/Config.in
index e5795394835f2156b1f87c42a21ac25e1606e5bb..8031a6354b6b275245a300f68ea15636fc741ee7 100644 (file)
--- a/package/multimedia/gst1-plugins-good/Config.in
+++ b/package/multimedia/gst1-plugins-good/Config.in
@@ -288,9 +288,14 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
        bool "gdkpixbuf"
        select BR2_PACKAGE_GDK_PIXBUF
+       depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
        help
          GdkPixbuf-based image decoder, overlay and sink
 
+comment "gdkpixbuf requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
        depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
        depends on BR2_LARGEFILE # pulseaudio -> libsndfile
@@ -301,10 +306,15 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
        bool "souphttpsrc (http client)"
+       depends on BR2_USE_WCHAR # libsoup -> glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2
        select BR2_PACKAGE_LIBSOUP
        help
          libsoup HTTP client src/sink
 
+comment "souphttpsrc requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX
        bool "speex"
        select BR2_PACKAGE_SPEEX

diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index d2f99da91ecf5ab77954c08666d1a3bebb3cdca3..5188b8fdb7319a48e016d2b7ad1fa02cfcfc124e 100644 (file)
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GSTREAMER
        bool "gstreamer"
        depends on BR2_USE_WCHAR # glib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        help
          GStreamer is an open source multimedia framework.

diff --git a/package/multimedia/gstreamer1/Config.in b/package/multimedia/gstreamer1/Config.in
index 627814c72c2a788bbab8fdf20d83b4ed377e8d3c..69a87f3394f4ae7f2d8d8d44833089fc3f775eb4 100644 (file)
--- a/package/multimedia/gstreamer1/Config.in
+++ b/package/multimedia/gstreamer1/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GSTREAMER1
        bool "gstreamer1"
        depends on BR2_USE_WCHAR # glib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        help
          GStreamer is an open source multimedia framework. This 1.x version of
@@ -49,5 +49,5 @@ config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS
 
 endif
 
-comment "gstreamer1 requires a toolchain with WCHAR and threads support"
+comment "gstreamer1 requires a toolchain with WCHAR and threading support"
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 6e5c6900bb6a4508322787ede193bd31f8695908..2ca55cc3cfe15577ee151d0da5a69d3271c392c4 100644 (file)
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -1,7 +1,8 @@
 menuconfig BR2_PACKAGE_MPD
        bool "mpd"
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_USE_WCHAR
+       depends on BR2_USE_WCHAR # libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
@@ -181,5 +182,6 @@ config BR2_PACKAGE_MPD_WAVPACK
 
 endif
 
-comment "mpd requires a toolchain with C++ and WCHAR support"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "mpd requires a toolchain with C++, threading and WCHAR support"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/nbd/Config.in b/package/nbd/Config.in
index 79b34deb2ab770d9455873f5d12a6cb794fa0ee0..0a0c7bda43bae2a3bf4b0522dbdf749abb099e37 100644 (file)
--- a/package/nbd/Config.in
+++ b/package/nbd/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NBD
        bool "nbd"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        help
          NBD is a set of utilities to configure network block devices,
@@ -8,9 +9,6 @@ config BR2_PACKAGE_NBD
 
          http://nbd.sf.net/
 
-comment "nbd requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
-
 if BR2_PACKAGE_NBD
 
 config BR2_NBD_CLIENT
@@ -25,3 +23,6 @@ config BR2_NBD_SERVER
          the server part of NBD.
 
 endif
+
+comment "nbd requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/neard/Config.in b/package/neard/Config.in
index ec1fcb302390d274954a5f82f9ab86cc56d477c5..97966da2a97bf260f1103ed86e618e90cdeecf2c 100644 (file)
--- a/package/neard/Config.in
+++ b/package/neard/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_NEARD
        bool "neard"
        depends on BR2_USE_WCHAR # libglib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libnl / dbus
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libnl, dbus, libglib2
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_LIBGLIB2
@@ -14,11 +14,14 @@ config BR2_PACKAGE_NEARD
 
          https://01.org/linux-nfc/documentation/how-start-linux-nfc-code...
 
+if BR2_PACKAGE_NEARD
+
 config BR2_PACKAGE_NEARD_TOOLS
        bool "neard tools"
-       depends on BR2_PACKAGE_NEARD
        help
          Build and install neard tools.
 
+endif
+
 comment "neard requires a toolchain with WCHAR and threads support"
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/neardal/Config.in b/package/neardal/Config.in
index 76b5ffa50abaeb78a4e666c09414454b9463486e..3841cac6e492d6282773e5b5460311e58b06f795 100644 (file)
--- a/package/neardal/Config.in
+++ b/package/neardal/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_NEARDAL
        bool "neardal"
        depends on BR2_USE_WCHAR # glib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_GLIB
@@ -11,11 +11,14 @@ config BR2_PACKAGE_NEARDAL
 
          https://github.com/connectivity/neardal
 
+if BR2_PACKAGE_NEARDAL
+
 config BR2_PACKAGE_NEARDAL_NCL
        bool "ncl tool"
-       depends on BR2_PACKAGE_NEARDAL
        help
          Build and install neardal ncl command line interpreter tool.
 
-comment "neardal requires a toolchain with WCHAR and threads support"
+endif
+
+comment "neardal requires a toolchain with WCHAR and threading support"
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index cc33a1dad5ba1e7745911b617e770c74a0ae0add..50a3e744b6e2b71044fbdfb4d58be9f8d6ec92ec 100644 (file)
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
        depends on BR2_INET_IPV6
        depends on BR2_LARGEFILE # acl
        depends on BR2_USE_WCHAR # libglib2 and gnutls
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_DBUS_GLIB
        select BR2_PACKAGE_UDEV

diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index 624854405208d2023aa584cd224502a57f0bb727..5d82170e062548b85a879f38c1fcf113431d7fe9 100644 (file)
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_OFONO
        bool "ofono"
-       depends on BR2_USE_WCHAR # gettext/libglib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+       depends on BR2_USE_WCHAR # gettext, libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_LIBCAP_NG
        select BR2_PACKAGE_DBUS
@@ -15,5 +15,4 @@ config BR2_PACKAGE_OFONO
          http://ofono.org/
 
 comment "ofono requires a toolchain with WCHAR and thread support"
-       depends on !BR2_USE_WCHAR || \
-               !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 26bf5e79c3b7a6ffa1ec4219e6d0005446eebfa5..c6ec3fed23892bdc16015e80c22c079db2bda80e 100644 (file)
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -139,16 +139,20 @@ comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support"
 
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
        bool "gstreamer support"
-       depends on BR2_USE_WCHAR
-       depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_USE_WCHAR # gstreamer -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2
        select BR2_PACKAGE_GSTREAMER
        select BR2_PACKAGE_GST_PLUGINS_BASE
        select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
 
+comment "gstreamer support requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_OPENCV_WITH_GTK
        bool "gtk support"
        depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
-       depends on BR2_USE_WCHAR
+       depends on BR2_USE_WCHAR # libgtk2 -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2
        depends on BR2_INSTALL_LIBSTDCPP
        select BR2_PACKAGE_LIBGTK2
 

diff --git a/package/openobex/Config.in b/package/openobex/Config.in
index 6494b2952d750ca92ab1e733c4b06348d4337f0f..c8e1f65878d60b8ce8fcaa9282f5eaca7f75bdaf 100644 (file)
--- a/package/openobex/Config.in
+++ b/package/openobex/Config.in
@@ -1,6 +1,3 @@
-comment "openobex requires a toolchain with IPV6 support"
-       depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_OPENOBEX
        bool "openobex"
        depends on BR2_INET_IPV6
@@ -12,25 +9,25 @@ config BR2_PACKAGE_OPENOBEX
 
 if BR2_PACKAGE_OPENOBEX
 
-comment "bluez support require a toolchain with WCHAR and thread support"
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
 config BR2_PACKAGE_OPENOBEX_BLUEZ
        bool "enable bluez support"
        depends on !BR2_avr32
        depends on BR2_USE_WCHAR # libglib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_BLUEZ_UTILS
 
-comment "libusb support require a toolchain with thread support"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "bluez support require a toolchain with WCHAR and thread support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OPENOBEX_LIBUSB
        bool "enable libusb support"
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_LIBUSB
 
+comment "libusb support require a toolchain with thread support"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_OPENOBEX_APPS
        bool "install test applications"
        help
@@ -43,3 +40,6 @@ config BR2_PACKAGE_OPENOBEX_DUMP
        bool "enable protocol dumping for debugging"
 
 endif
+
+comment "openobex requires a toolchain with IPV6 support"
+       depends on !BR2_INET_IPV6

diff --git a/package/pango/Config.in b/package/pango/Config.in
index 6c8a16024e52efb5a6233461356b0564c8f91402..845ea98eada73229b266cb269d9abc5929a7df7c 100644 (file)
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PANGO
        bool "pango"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_INSTALL_LIBSTDCPP # freetype support
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_EXPAT
@@ -18,5 +19,6 @@ config BR2_PACKAGE_PANGO
 
          http://www.pango.org/
 
-comment "pango requires a toolchain with WCHAR and C++ support"
-       depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+comment "pango requires a toolchain with WCHAR, threading and C++ support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+               !BR2_INSTALL_LIBSTDCPP

diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index 484192b1b8ea5516798dcc801ffe07cc918715b7..5c80c10c0a1e1cc5b5786f1ef0aea2a6a4491d9c 100644 (file)
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PCMANFM
        bool "pcmanfm"
        depends on BR2_PACKAGE_XORG7
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_GAMIN
        select BR2_PACKAGE_STARTUP_NOTIFICATION
        select BR2_PACKAGE_XLIB_LIBX11
@@ -12,5 +13,6 @@ config BR2_PACKAGE_PCMANFM
 
          http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 
-comment "pcmanfm requires a toolchain with WCHAR support"
-       depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR
+comment "pcmanfm requires a toolchain with WCHAR and threading support"
+       depends on BR2_PACKAGE_XORG7 && \
+       (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
index 7f96d9b67588562d98f1a3e2ad21d7d92add4c3f..bf702d039695d619ef12698aef70aae5ab647512 100644 (file)
--- a/package/pkg-config/Config.in
+++ b/package/pkg-config/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PKG_CONFIG
        bool "pkg-config"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_DEPRECATED
        select BR2_PACKAGE_LIBGLIB2
        help
@@ -11,5 +12,5 @@ config BR2_PACKAGE_PKG_CONFIG
 
          http://www.freedesktop.org/software/pkgconfig/
 
-comment "pkg-config requires a toolchain with WCHAR support"
-       depends on BR2_DEPRECATED && !BR2_USE_WCHAR
+comment "pkg-config requires a toolchain with WCHAR and threading support"
+       depends on BR2_DEPRECATED && (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/polkit/Config.in b/package/polkit/Config.in
index b47022a0265926318fd28c972ceef9e342bf3e11..df6c7679a74896128334412ba7aaaf5eae9f407b 100644 (file)
--- a/package/polkit/Config.in
+++ b/package/polkit/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_POLKIT
        bool "polkit"
        depends on BR2_USE_WCHAR # libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_EXPAT
        help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_POLKIT
 
          http://www.freedesktop.org/wiki/Software/polkit
 
-comment "polkit requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "polkit requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index 60ae2ae738f785edf958fedc996e168edae82db3..e9b51c0163c13fbca14124444798b1eb6ca1c590 100644 (file)
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -42,7 +42,7 @@ config BR2_PACKAGE_SCONESERVER_BLUETOOTH
        bool "bluetooth"
        depends on BR2_USE_WCHAR # bluez->libglib2
        depends on BR2_USE_MMU # bluez->dbus
-       depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus
+       depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2
        depends on !BR2_avr32 # bluez_utils
        select BR2_PACKAGE_BLUEZ_UTILS
        help

diff --git a/package/shared-mime-info/Config.in b/package/shared-mime-info/Config.in
index b08c1fdaa6d2ecdd07accd1715afb3ab5f8cccf0..ee635accc804d23cbc828cc45a018c961f497fcb 100644 (file)
--- a/package/shared-mime-info/Config.in
+++ b/package/shared-mime-info/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SHARED_MIME_INFO
        bool "shared-mime-info"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_LIBXML2
        help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_SHARED_MIME_INFO
 
          http://freedesktop.org/wiki/Software/shared-mime-info
 
-comment "shared-mime-info requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "shared-mime-info requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in
index 99abb350fab3998d799c42802297de2e07dd8ec8..71b60e622f15c1058db52ba463ae36ec14f6ea7f 100644 (file)
--- a/package/snowball-init/Config.in
+++ b/package/snowball-init/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_SNOWBALL_INIT
        select BR2_PACKAGE_BLUEZ_UTILS
        depends on !BR2_avr32
        depends on BR2_USE_WCHAR # libglib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_UX500_FIRMWARE
        help
@@ -12,3 +12,6 @@ config BR2_PACKAGE_SNOWBALL_INIT
 
          http://www.igloocommunity.org
 
+comment "snowball-init requires a toolchain with WCHAR and threading support"
+       depends on !BR2_avr32 && \
+               (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index b6d5aa6d2f5df775d875fc326ba27c9e16e8ab12..3e7ed15a71d22a81a99d8ef9b8c5a9163d1455cd 100644 (file)
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_SSHFS
        select BR2_PACKAGE_OPENSSH
        depends on BR2_LARGEFILE
        depends on BR2_USE_WCHAR # glib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
        depends on BR2_USE_MMU # libfuse
        depends on !BR2_PREFER_STATIC_LIB # libfuse
        help

diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in
index 513a32cd591ea160a8e71100bd92fe341464c2bf..d78062aebc1e52149b5840721bac0fc5df7b6b61 100644 (file)
--- a/package/sysprof/Config.in
+++ b/package/sysprof/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_SYSPROF
        bool "sysprof"
        select BR2_PACKAGE_LIBGLIB2
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        # In its util.h file, sysprof contains architecture-specific
        # code
        depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb
@@ -11,14 +12,17 @@ config BR2_PACKAGE_SYSPROF
 
          http://sysprof.com
 
+if BR2_PACKAGE_SYSPROF
+
 config BR2_PACKAGE_SYSPROF_GUI
        bool "sysprof GUI"
-       depends on BR2_PACKAGE_SYSPROF
        depends on BR2_PACKAGE_LIBGTK2
        select BR2_PACKAGE_LIBGLADE
        select BR2_PACKAGE_GDK_PIXBUF
        help
          GUI for the sysprof system-wide statistical profiler.
 
-comment "sysprof requires a toolchain with WCHAR support"
-        depends on !BR2_USE_WCHAR
+endif
+
+comment "sysprof requires a toolchain with WCHAR and threading support"
+        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/udev/Config.in b/package/udev/Config.in
index d3244d1a961eef2cf913819e559f543a4c11952f..ed32c8975e12ef3de9de67c256937566a0d2a4b5 100644 (file)
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -25,10 +25,15 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
        select BR2_PACKAGE_ACL
        select BR2_PACKAGE_HWDATA
        select BR2_PACKAGE_LIBGLIB2
+       depends on BR2_USE_WCHAR # libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        help
          Enable all extras with external dependencies like
          libacl, hwdata and libglib2
 
+comment "enabling all extras requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_USE_THREADS
+
 endif
 
 comment "udev requires /dev mgmnt set to udev under System configuration"

diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index a50b3ea33581c6d2fa336e4c4d681cc3808bc856..dca23ea4fec526e01ad6cc10be47aa9a6b983656 100644 (file)
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -1,12 +1,13 @@
 config BR2_PACKAGE_UDISKS
        bool "udisks"
        depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
-       depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2
        depends on BR2_USE_MMU # lvm2
        select BR2_PACKAGE_UDEV
        select BR2_PACKAGE_UDEV_ALL_EXTRAS
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_GLIB
+       depends on BR2_USE_WCHAR # dbus-glib -> glib2
        select BR2_PACKAGE_SG3_UTILS
        select BR2_PACKAGE_POLKIT
        select BR2_PACKAGE_PARTED
@@ -24,12 +25,16 @@ config BR2_PACKAGE_UDISKS
 
          http://www.freedesktop.org/wiki/Software/udisks
 
+if BR2_PACKAGE_UDISKS
+
 config BR2_PACKAGE_UDISKS_LVM2
        bool "lvm2 support"
-       depends on BR2_PACKAGE_UDISKS
        select BR2_PACKAGE_LVM2_APP_LIBRARY
        help
          Enable LVM2 support
 
-comment "udisks requires /dev mgmnt set to udev under System configuration"
-       depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+endif
+
+comment "udisks requires /dev mgmnt set to udev under System configuration and a toolchain with WCHAR and threading support"
+       depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
+               !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
index 716ce34a8835b5a4465cf8a9588a1e105474a617..27c5a4370e67822e168cd19b7524a327917adb18 100644 (file)
--- a/package/ussp-push/Config.in
+++ b/package/ussp-push/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_USSP_PUSH
        depends on BR2_INET_IPV6
        depends on !BR2_avr32
        depends on BR2_USE_WCHAR # libglib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_OPENOBEX
        select BR2_PACKAGE_OPENOBEX_BLUEZ

diff --git a/package/vala/Config.in b/package/vala/Config.in
index 805c7707cff0d90c35200497249fe336b344d59d..35c02574f424b3df0987187cfe670cbd691b7c60 100644 (file)
--- a/package/vala/Config.in
+++ b/package/vala/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_VALA
        # We no longer support a toolchain on the target
        depends on BR2_DEPRECATED
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
@@ -11,5 +12,5 @@ config BR2_PACKAGE_VALA
 
          http://live.gnome.org/Vala
 
-comment "vala requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "vala requires a toolchain with WCHAR and threading support"
+       depends on BR2_DEPRECATED && (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index c6711b8d48b24f9eb8d2a6eb76a9220184effa7d..92cbc62ecd412e02dca5a0c1f81ad7f67a6dc63f 100644 (file)
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_WEBKIT
        bool "webkit"
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_USE_WCHAR
+       depends on BR2_USE_WCHAR # enchant -> libglib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # enchant -> libglib2
        depends on BR2_PACKAGE_LIBGTK2
        select BR2_PACKAGE_ICU
        select BR2_PACKAGE_LIBCURL
@@ -22,5 +23,6 @@ config BR2_PACKAGE_WEBKIT
 
          http://webkit.org/
 
-comment "webkit requires C++, WCHAR in toolchain and libgtk2"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2
+comment "webkit requires libgtk2 and a toolchain with C++, WCHAR, threading support"
+       depends on BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
+               !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index d4c8b43f45ec7dd9e40fe4055d09f9fb618066b5..111dd4835c10b25719c1603d85bfe399d5b1ce03 100644 (file)
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -5,11 +5,12 @@ config BR2_PACKAGE_WIRESHARK
        select BR2_PACKAGE_LIBGLIB2
        depends on BR2_USE_MMU # fork()
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        help
          Network traffic sniffer and protocol decoder. Currently only tshark,
          the console interface, is enabled.
 
          http://www.wireshark.org
 
-comment "wireshark requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "wireshark requires a toolchain with WCHAR and threading support"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS