Commit b1ba675c authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

x11r7: fix kconfig dependencies 



Most of X.org (E.G. libX11) needs WCHAR support, so ensure that
the toplevel BR2_PACKAGE_XORG7 cannot get enabled unless we have
WCHAR support in the toolchain.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 8323cd9b

package/x11r7/Config.in

+5 −2
Original line number Diff line number Diff line
@@ -4,10 +4,14 @@ menuconfig BR2_PACKAGE_XORG7 
	select BR2_PACKAGE_LIBPNG

	select BR2_PACKAGE_EXPAT

	select BR2_PACKAGE_FONTCONFIG

	depends on BR2_USE_WCHAR

	help

	  Support for X11R7 libraries, servers, drivers, and/or

	  applications in the target.



comment "X.org requires a toolchain with WCHAR support"

        depends on !BR2_USE_WCHAR



if BR2_PACKAGE_XORG7



choice
@@ -19,11 +23,10 @@ choice 
config BR2_PACKAGE_XSERVER_xorg

	bool "Modular X.org"

	# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus

	depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE

	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE



config BR2_PACKAGE_XSERVER_tinyx

	bool "TinyX"

	depends on BR2_USE_WCHAR



endchoice