summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-10-05 19:05:28 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2009-10-05 19:05:28 (GMT)
commitb1ba675c85c717e376103f07fe9dba8abc380089 (patch)
treee503da66da94afc61eafccd710c32eb6ec193d2d
parent8323cd9b87785958b4ca538cca3c72be5bea2984 (diff)
downloadbuildroot-b1ba675c85c717e376103f07fe9dba8abc380089.tar.gz
buildroot-b1ba675c85c717e376103f07fe9dba8abc380089.tar.bz2
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: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/x11r7/Config.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index ace438a..b827367 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -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