cppcms: really depend on wchar
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 6 Sep 2014 14:04:33 +0000 (16:04 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Sat, 6 Sep 2014 20:15:27 +0000 (22:15 +0200)
In commit f8993ebb34823b301ea2bf4f1f57495ec29b906b ("cppcms: needs
wchar support even without icu"), Peter wanted to move the wchar
dependency from the ICU sub-option of cppcms to the main cppcms option
itself. However, for some reason it didn't do the entire change, and
the commit was lacking:

 * Removing the wchar dependency from BR2_PACKAGE_CPPCMS_ICU

 * Adding the wchar dependency to BR2_PACKAGE_CPPCMS.

It was only handling the two comments.

This should really fix:

  http://autobuild.buildroot.net/results/6f8/6f8e8b68235f6cf0dfef13e3ed11f97a3ab50a06/

and other similar build failures that are still occuring after
f8993ebb34823b301ea2bf4f1f57495ec29b906b has been applied.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/cppcms/Config.in

index 460c8752db1a49d5305bb63c02d9c906c88c64aa..f02ff177ab06d894a339cbcb42421aaa601e405c 100644 (file)
@@ -6,6 +6,7 @@ config BR2_PACKAGE_CPPCMS
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
        depends on !BR2_PREFER_STATIC_LIB # dlopen()
+       depends on BR2_USE_WCHAR
        help
          CppCMS is a Free High Performance Web Development Framework
          (not a CMS) aimed for Rapid Web Application Development. It
@@ -25,7 +26,6 @@ if BR2_PACKAGE_CPPCMS
 config BR2_PACKAGE_CPPCMS_ICU
        bool "enable icu support"
        depends on !BR2_BINFMT_FLAT # icu
-       depends on BR2_USE_WCHAR # icu
        depends on BR2_ARCH_HAS_ATOMICS # icu
        select BR2_PACKAGE_ICU
        help