icu: Doesn't work on ARC yet

icu depends on __sync_sub_and_fetch and other atomic primitives that
don't exist in the ARC toolchain yet.

[Peter: adjust beecrypt/php comment dependency, don't mention atomic builtins]
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in
index caa6d1784a65752438c02f662eaeb4417e276159..033742c8f8767880397916e3c5386c9e6d32d858 100644 (file)
--- a/package/beecrypt/Config.in
+++ b/package/beecrypt/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_BEECRYPT
        bool "beecrypt"
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
+       select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+              !BR2_arc
        help
          Beecrypt is a general-purpose cryptography library.
 
@@ -11,4 +12,5 @@ comment "beecrypt needs a toolchain w/ threads"
        depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 comment "beecrypt C++ support needs a toolchain w/ wchar"
+       depends on !BR2_arc
        depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
index e13e076cd3f570c3dcae3c2ce5b11561b6a5be26..c5d64cedd050fbe45295c4e8ec02a7526de746da 100644 (file)
--- a/package/cppcms/Config.in
+++ b/package/cppcms/Config.in
@@ -23,6 +23,7 @@ config BR2_PACKAGE_CPPCMS
 config BR2_PACKAGE_CPPCMS_ICU
        bool "enable icu support"
        depends on BR2_PACKAGE_CPPCMS
+       depends on !BR2_arc # icu -> atomic builtins
        select BR2_PACKAGE_ICU
        help
          Using ICU allows advanced localization features into CppCMS,

diff --git a/package/icu/Config.in b/package/icu/Config.in
index 585bffb7ad4bcc8ca85d386caedf5a0b8134671b..b736b438d813892b0ac98cb2623b006791f4a3e5 100644 (file)
--- a/package/icu/Config.in
+++ b/package/icu/Config.in
@@ -3,11 +3,13 @@ config BR2_PACKAGE_ICU
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_arc # atomic builtins
        help
          International Components for Unicode.
 
          http://site.icu-project.org/
 
 comment "icu needs a toolchain w/ C++, wchar, threads"
+       depends on !BR2_arc
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
                !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/php/Config.ext b/package/php/Config.ext
index c0c85f1fe20fe8140f2f9fa522dfdda1446bf0d7..23d23064bc71e8f8f5e066433612cd5c34ec7b8e 100644 (file)
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -172,10 +172,12 @@ config BR2_PACKAGE_PHP_EXT_INTL
        select BR2_PACKAGE_ICU
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
+       depends on !BR2_arc # icu -> atomic builtins
        help
          Internationalization support
 
 comment "intl support needs a toolchain w/ C++, wchar"
+       depends on !BR2_arc
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
 comment "Image processing"

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 83f17e35eafe96380371effae58689a2b6785802..e932e240a48859b6c5e711f09f693ecee425fbaf 100644 (file)
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -181,6 +181,7 @@ config BR2_PACKAGE_QT5BASE_DBUS
 config BR2_PACKAGE_QT5BASE_ICU
        bool "Enable ICU support"
        select BR2_PACKAGE_ICU
+       depends on !BR2_arc # icu -> atomic builtins
        help
          This option enables ICU support in Qt5. This is for example
          needed for Qt5Webkit.