Просмотр исходного кода

xorg: depend on WCHAR and LOCALE

Xorg needs WCHAR and LOCALE, so make sure it cannot be selected unless
this is enabled in the toolchain.

We unfortunately cannot make BR2_XSERVER_xorg depend on BR2_USE_LOCALE
because of a strange recursion error with dbus, but now we atleast
inform the user what to do to get a working configuration.

The real solution is ofcause of fix xorg, but that's for another day.
Peter Korsgaard 17 лет назад
Родитель
Сommit
bf83d53080
1 измененных файлов с 4 добавлено и 0 удалено
  1. 4 0
      package/Config.in

+ 4 - 0
package/Config.in

@@ -353,6 +353,10 @@ config BR2_PACKAGE_XSERVER_none
 	default y
 config BR2_PACKAGE_XSERVER_xorg
 	bool "modular xorg"
+	depends on BR2_USE_WCHAR # && BR2_ENABLE_LOCALE
+# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
+comment "xorg requires a toolchain with LOCALE and WCHAR support"
+	depends on !(BR2_USE_WCHAR && BR2_ENABLE_LOCALE)
 config BR2_PACKAGE_XSERVER_tinyx
 	bool "tinyx"
 endmenu