Config.in files: add missing dependencies to toolchain option comments

When a package A depends on config option B and toolchain option C, then the comment that is given when C is not fulfilled should also depend on B. For example: config BR2_PACKAGE_A depends on BR2_B depends on BR2_LARGEFILE depends on BR2_WCHAR comment "A needs a toolchain w/ largefile, wchar" depends on !BR2_LARGEFILE || !BR2_WCHAR This comment should actually be: comment "A needs a toolchain w/ largefile, wchar" depends on BR2_B depends on !BR2_LARGEFILE || !BR2_WCHAR or if possible (typically when B is a package config option declared in that same Config.in file): if BR2_B comment "A needs a toolchain w/ largefile, wchar" depends on !BR2_LARGEFILE || !BR2_WCHAR [other config options depending on B] endif Otherwise, the comment would be visible even though the other dependencies are not met. This patch adds such missing dependencies, and changes existing such dependencies from depends on BR2_BASE_DEP && !BR2_TOOLCHAIN_USES_GLIBC to depends on BR2_BASE_DEP depends on !BR2_TOOLCHAIN_USES_GLIBC so that (positive) base dependencies are separate from the (negative) toolchain dependencies. This strategy makes it easier to write such comments (because one can simply copy the base dependency from the actual package config option), but also avoids complex and long boolean expressions. Signed-off-by: Thomas De Schampheleire <[email protected]> Acked-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> (untested) Signed-off-by: Peter Korsgaard <[email protected]>
TillAlex · Nov 10, 2013 · be08420 · be08420
1 parent 3c33c11
commit be08420
Show file tree

Hide file tree

Showing 162 changed files with 228 additions and 50 deletions.
diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in
@@ -13,4 +13,5 @@ config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
  default "fs/iso9660/menu.lst"
 
 comment "iso image requires a Linux kernel to be built"
- depends on (BR2_i386 || BR2_x86_64) && !BR2_LINUX_KERNEL
+ depends on BR2_i386 || BR2_x86_64
+ depends on !BR2_LINUX_KERNEL
diff --git a/linux/Config.ext.in b/linux/Config.ext.in
@@ -17,6 +17,8 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
  PowerPC, 2.6.35.7, 2.6.36.4, 3.0.8.
 
 comment "xenomai needs a toolchain w/ threads"
+ depends on BR2_i386 || BR2_x86_64 || BR2_arm || \
+ BR2_bfin || BR2_powerpc || BR2_sh4
  depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH

diff --git a/package/a10disp/Config.in b/package/a10disp/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_A10DISP
  http:https://github.com/hglm/a10disp
 
 comment "a10disp requires the linux kernel"
- depends on BR2_arm && !BR2_LINUX_KERNEL
+ depends on BR2_arm
+ depends on !BR2_LINUX_KERNEL
diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
@@ -20,4 +20,5 @@ config BR2_PACKAGE_AICCU
  http:https://www.sixxs.net/tools/aiccu/
 
 comment "aiccu needs a toolchain w/ IPv6, wchar, threads"
+ depends on BR2_USE_MMU
  depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in
@@ -11,5 +11,6 @@ config BR2_PACKAGE_AIRCRACK_NG
  http:https://www.aircrack-ng.org/
 
 comment "aircrack-ng needs a toolchain w/ largefile, threads"
+ depends on BR2_USE_MMU
  depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/alsamixergui/Config.in b/package/alsamixergui/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_ALSAMIXERGUI
  http:https://www.iua.upf.es/~mdeboer/projects/alsamixergui/
 
 comment "alsamixergui needs a toolchain w/ C++, threads"
- depends on (!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS) && BR2_PACKAGE_XORG7
+ depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/avahi/Config.in b/package/avahi/Config.in
@@ -37,4 +37,5 @@ config BR2_PACKAGE_AVAHI_DAEMON
 endif
 
 comment "avahi needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
  depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bcusdk/Config.in b/package/bcusdk/Config.in
@@ -20,4 +20,5 @@ config BR2_PACKAGE_BCUSDK
  http:https://www.auto.tuwien.ac.at/~mkoegler/eib/
 
 comment "bcusdk needs a toolchain w/ C++"
+ depends on BR2_USE_MMU
  depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bind/Config.in b/package/bind/Config.in
@@ -40,4 +40,5 @@ config BR2_PACKAGE_BIND_TOOLS
 endif
 
 comment "bind needs a toolchain w/ largefile, IPv6"
+ depends on BR2_USE_MMU
  depends on !(BR2_LARGEFILE || BR2_INET_IPV6)
diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_BLACKBOX
  http:https://blackboxwm.sourceforge.net/
 
 comment "blackbox needs a toolchain w/ C++"
- depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP
+ depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+ depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
@@ -39,4 +39,5 @@ config BR2_PACKAGE_BLUEZ_UTILS_USB
 endif
 
 comment "bluez-utils needs a toolchain w/ wchar, threads"
+ depends on !BR2_avr32 && BR2_USE_MMU
  depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bmon/Config.in b/package/bmon/Config.in
@@ -6,4 +6,5 @@ config BR2_PACKAGE_BMON
  Linux bandwidth monitor
 
 comment "bmon needs a toolchain w/ IPv6"
+ depends on BR2_USE_MMU
  depends on !BR2_INET_IPV6
diff --git a/package/bonnie/Config.in b/package/bonnie/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_BONNIE
  http:https://www.coker.com.au/bonnie++/
 
 comment "bonnie++ needs a toolchain w/ C++"
+ depends on BR2_USE_MMU
  depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bustle/Config.in b/package/bustle/Config.in
@@ -20,4 +20,5 @@ config BR2_PACKAGE_BUSTLE
  http:https://www.willthompson.co.uk/bustle/
 
 comment "bustle needs a toolchain w/ wchar, threads"
+ depends on BR2_PACKAGE_DBUS
  depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ccid/Config.in b/package/ccid/Config.in
@@ -10,4 +10,5 @@ config BR2_PACKAGE_CCID
  http:https://pcsclite.alioth.debian.org/ccid.html
 
 comment "ccid needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
  depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_CDRKIT
  http:https://www.cdrkit.org/
 
 comment "cdrkit needs a toolchain w/ largefile"
+ depends on BR2_USE_MMU
  depends on !BR2_LARGEFILE
diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in
@@ -24,4 +24,5 @@ comment "Lua support needs a toolchain w/ largefile"
 endif
 
 comment "civetweb needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
  depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/classpath/Config.in b/package/classpath/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_CLASSPATH
  http:https://classpath.org
 
 comment "classpath needs a toolchain w/ IPv6"
+ depends on BR2_PACKAGE_JAMVM
  depends on !BR2_INET_IPV6
diff --git a/package/connman/Config.in b/package/connman/Config.in
@@ -51,6 +51,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 endif # BR2_PACKAGE_CONNMAN
 
 comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver"
- depends on !BR2_avr32
+ depends on BR2_USE_MMU && !BR2_avr32
  depends on BR2_UCLIBC_VERSION_0_9_32 || \
  !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
@@ -18,6 +18,7 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
  http:https://www.netfilter.org/projects/conntrack-tools/
 
 comment "conntrack-tools needs a toolchain w/ IPv6, largefile, threads"
+ depends on BR2_USE_MMU
  depends on !BR2_INET_IPV6 || \
  !BR2_LARGEFILE || \
  !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/coreutils/Config.in b/package/coreutils/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_COREUTILS
  http:https://www.gnu.org/software/coreutils/
 
 comment "coreutils needs a toolchain w/ wchar"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_CRYPTSETUP
  https://code.google.com/p/cryptsetup/
 
 comment "cryptsetup needs a toolchain w/ largefile, wchar"
+ depends on BR2_USE_MMU
  depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
@@ -18,4 +18,5 @@ config BR2_PACKAGE_CURLFTPFS
  http:https://curlftpfs.sourceforge.net/
 
 comment "curlftpfs needs a toolchain w/ largefile, wchar, threads, dynamic library"
+ depends on BR2_USE_MMU
  depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/cvs/Config.in b/package/cvs/Config.in
@@ -16,4 +16,5 @@ config BR2_PACKAGE_CVS_SERVER
  Enable cvs server code
 
 comment "cvs needs a toolchain w/ wchar"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR
diff --git a/package/czmq/Config.in b/package/czmq/Config.in
@@ -16,5 +16,7 @@ config BR2_PACKAGE_CZMQ
  http:https://czmq.zeromq.org/
 
 comment "czmq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
+ depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+ !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
  depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
  && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_DBUS_GLIB
  http:https://www.freedesktop.org/software/dbus
 
 comment "dbus-glib needs a toolchain w/ wchar, threads"
- depends on BR2_PACKAGE_DBUS && \
-  (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+ depends on BR2_PACKAGE_DBUS
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_DBUS_PYTHON
  http:https://dbus.freedesktop.org/doc/dbus-python/
 
 comment "dbus-python needs a toolchain w/ wchar, threads"
- depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && \
-  (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+ depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
@@ -28,4 +28,5 @@ choice
 endchoice
 
 comment "dbus needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
  depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_DMRAID
  respective mappings for the ATARAID sets discovered.
 
 comment "dmraid needs a toolchain w/ largefile"
+ depends on BR2_USE_MMU
  depends on !BR2_LARGEFILE
diff --git a/package/docker/Config.in b/package/docker/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_DOCKER
  http:https://icculus.org/openbox/2/docker
 
 comment "docker needs a toolchain w/ wchar, threads"
- depends on BR2_PACKAGE_XORG7 && \
-  (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+ depends on BR2_PACKAGE_XORG7
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_DROPWATCH
  https://fedorahosted.org/dropwatch/
 
 comment "dropwatch needs a toolchain w/ threads"
+ depends on !BR2_aarch64
  depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dstat/Config.in b/package/dstat/Config.in
@@ -21,4 +21,5 @@ config BR2_PACKAGE_DSTAT
  http:https://dag.wieers.com/home-made/dstat/
 
 comment "dstat needs a toolchain w/ wchar"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR
diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_EBTABLES
  http:https://ebtables.sourceforge.net
 
 comment "ebtables needs a toolchain w/ IPv6"
+ depends on BR2_USE_MMU
  depends on !BR2_INET_IPV6
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
@@ -24,6 +24,7 @@ config BR2_PACKAGE_LIBEDBUS_BLUEZ
  Bluetooth support.
 
 comment "bluez support needs a toolchain w/ wchar, threads"
+ depends on !BR2_avr32
  depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_LIBEDBUS_CONNMAN
@@ -40,4 +41,5 @@ config BR2_PACKAGE_LIBEDBUS_NOTIFY
 endif
 
 comment "libedbus needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
  depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
@@ -37,6 +37,6 @@ config BR2_PACKAGE_ENLIGHTENMENT
  http:https://www.enlightenment.org/
 
 comment "enlightenment needs a toolchain w/ wchar, C++, threads"
- depends on BR2_PACKAGE_XORG7
+ depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
  depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
  depends on !BR2_avr32
diff --git a/package/exfat/Config.in b/package/exfat/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_EXFAT
  http:https://code.google.com/p/exfat/
 
 comment "exfat needs a toolchain w/ largefile, wchar, threads, dynamic library"
+ depends on BR2_USE_MMU
  depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
diff --git a/package/fdk-aac/Config.in b/package/fdk-aac/Config.in
@@ -15,3 +15,6 @@ config BR2_PACKAGE_FDK_AAC
 
 comment "fdk-aac needs a toolchain w/ C++"
  depends on !BR2_INSTALL_LIBSTDCPP
+ depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
+ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
+ BR2_powerpc || BR2_sh || BR2_sh64
diff --git a/package/filemq/Config.in b/package/filemq/Config.in
@@ -18,5 +18,7 @@ config BR2_PACKAGE_FILEMQ
  http:https://github.com/zeromq/filemq
 
 comment "filemq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
+ depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+ !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
  depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
  && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/findutils/Config.in b/package/findutils/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_FINDUTILS
  http:https://www.gnu.org/software/findutils/findutils.html
 
 comment "findutils needs a toolchain w/ wchar"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR
diff --git a/package/flex/Config.in b/package/flex/Config.in
@@ -7,16 +7,20 @@ config BR2_PACKAGE_FLEX
 
  http:https://flex.sourceforge.net/
 
+if BR2_PACKAGE_FLEX
+
 config BR2_PACKAGE_FLEX_BINARY
  bool "Install tool in the target"
  # needs fork()
  depends on BR2_USE_MMU
- depends on BR2_PACKAGE_FLEX
  # runtime dependency
  select BR2_PACKAGE_M4
  depends on BR2_USE_WCHAR # m4
  help
  Install the flex binary tool in the target filesystem.
 
 comment "flex binary needs a toolchain w/ wchar"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR
+
+endif
diff --git a/package/fltk/Config.in b/package/fltk/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_FLTK
  http:https://www.fltk.org/
 
 comment "fltk needs a toolchain w/ C++"
- depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7
+ depends on BR2_USE_MMU && BR2_PACKAGE_XORG7
+ depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/foomatic-filters/Config.in b/package/foomatic-filters/Config.in
@@ -1,4 +1,5 @@
 comment "foomatic-filters needs a toolchain w/ threads"
+ depends on BR2_PACKAGE_CUPS
  depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_FOOMATIC_FILTERS

diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -1,4 +1,5 @@
 comment "gpu-viv-bin-mx6q needs an (e)glibc toolchain"
+ depends on BR2_arm
  depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_GPU_VIV_BIN_MX6Q

diff --git a/package/gawk/Config.in b/package/gawk/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_GAWK
  http:https://www.gnu.org/software/gawk/
 
 comment "gawk needs a toolchain w/ wchar"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
@@ -1,4 +1,5 @@
 comment "gdb/gdbserver needs a toolchain w/ threads, threads debug"
+ depends on !BR2_aarch64
  depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 
 config BR2_PACKAGE_GDB
@@ -42,6 +43,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
  depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin
 
 comment "full gdb on target needs a toolchain w/ wchar"
+ depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin
  depends on !BR2_USE_WCHAR
 
 endif
diff --git a/package/gesftpserver/Config.in b/package/gesftpserver/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_GESFTPSERVER
  http:https://www.greenend.org.uk/rjk/sftpserver/
 
 comment "gesftpserver needs a toolchain w/ wchar, threads"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
@@ -25,4 +25,5 @@ config BR2_PACKAGE_GETTEXT_TOOLS
  correct operation of programs.
 
 comment "gettext needs a toolchain w/ wchar"
- depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
+ depends on BR2_NEEDS_GETTEXT
+ depends on !BR2_USE_WCHAR
diff --git a/package/git/Config.in b/package/git/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_GIT
  http:https://git-scm.com
 
 comment "git needs a toolchain w/ largefile"
+ depends on BR2_USE_MMU
  depends on !BR2_LARGEFILE
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
@@ -21,5 +21,5 @@ config BR2_PACKAGE_GMPC
  http:https://gmpcwiki.sarine.nl/index.php?title=GMPC
 
 comment "gmpc needs a toolchain w/ wchar, threads"
- depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR || \
-  !BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_PACKAGE_XORG7 && BR2_PACKAGE_LIBGTK2
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gob2/Config.in b/package/gob2/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_GOB2
  http:https://www.jirka.org/gob.html
 
 comment "gob2 needs a toolchain w/ wchar"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
@@ -1,4 +1,5 @@
 comment "gpsd needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
  depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GPSD

diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_GST_FFMPEG
  http:https://gstreamer.freedesktop.org/
 
 comment "gst-ffmpeg needs a toolchain w/ largefile, IPv6"
+ depends on BR2_PACKAGE_GSTREAMER
  depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/gtest/Config.in b/package/gtest/Config.in
@@ -22,4 +22,5 @@ config BR2_PACKAGE_GTEST
  http:https://code.google.com/p/googletest/
 
 comment "gtest needs a toolchain w/ C++, wchar, threads"
+ depends on BR2_USE_MMU
  depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gutenprint/Config.in b/package/gutenprint/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_GUTENPRINT
  http:https://gimp-print.sourceforge.net/
 
 comment "gutenprint needs a toolchain w/ C++"
+ depends on BR2_PACKAGE_CUPS
  depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
@@ -17,4 +17,5 @@ config BR2_PACKAGE_GVFS
  http:https://en.wikipedia.org/wiki/GVFS
 
 comment "gvfs needs a toolchain w/ largefile, wchar, threads"
+ depends on BR2_USE_MMU
  depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in
@@ -1,4 +1,5 @@
 comment "hiawatha needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
  depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_HIAWATHA