Explorar o código

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>
Mischa Jonker %!s(int64=11) %!d(string=hai) anos
pai
achega
9b6c5e9c98

+ 3 - 1
package/beecrypt/Config.in

@@ -1,7 +1,8 @@
 config BR2_PACKAGE_BEECRYPT
 config BR2_PACKAGE_BEECRYPT
 	bool "beecrypt"
 	bool "beecrypt"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	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
 	help
 	  Beecrypt is a general-purpose cryptography library.
 	  Beecrypt is a general-purpose cryptography library.
 
 
@@ -11,4 +12,5 @@ comment "beecrypt needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 
 comment "beecrypt C++ support needs a toolchain w/ wchar"
 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
 	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS

+ 1 - 0
package/cppcms/Config.in

@@ -23,6 +23,7 @@ config BR2_PACKAGE_CPPCMS
 config BR2_PACKAGE_CPPCMS_ICU
 config BR2_PACKAGE_CPPCMS_ICU
 	bool "enable icu support"
 	bool "enable icu support"
 	depends on BR2_PACKAGE_CPPCMS
 	depends on BR2_PACKAGE_CPPCMS
+	depends on !BR2_arc # icu -> atomic builtins
 	select BR2_PACKAGE_ICU
 	select BR2_PACKAGE_ICU
 	help
 	help
 	  Using ICU allows advanced localization features into CppCMS,
 	  Using ICU allows advanced localization features into CppCMS,

+ 2 - 0
package/icu/Config.in

@@ -3,11 +3,13 @@ config BR2_PACKAGE_ICU
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_arc # atomic builtins
 	help
 	help
 	  International Components for Unicode.
 	  International Components for Unicode.
 
 
 	  http://site.icu-project.org/
 	  http://site.icu-project.org/
 
 
 comment "icu needs a toolchain w/ C++, wchar, threads"
 comment "icu needs a toolchain w/ C++, wchar, threads"
+	depends on !BR2_arc
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
 		!BR2_TOOLCHAIN_HAS_THREADS

+ 2 - 0
package/php/Config.ext

@@ -172,10 +172,12 @@ config BR2_PACKAGE_PHP_EXT_INTL
 	select BR2_PACKAGE_ICU
 	select BR2_PACKAGE_ICU
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_WCHAR
+	depends on !BR2_arc # icu -> atomic builtins
 	help
 	help
 	  Internationalization support
 	  Internationalization support
 
 
 comment "intl support needs a toolchain w/ C++, wchar"
 comment "intl support needs a toolchain w/ C++, wchar"
+	depends on !BR2_arc
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
 
 comment "Image processing"
 comment "Image processing"

+ 1 - 0
package/qt5/qt5base/Config.in

@@ -181,6 +181,7 @@ config BR2_PACKAGE_QT5BASE_DBUS
 config BR2_PACKAGE_QT5BASE_ICU
 config BR2_PACKAGE_QT5BASE_ICU
 	bool "Enable ICU support"
 	bool "Enable ICU support"
 	select BR2_PACKAGE_ICU
 	select BR2_PACKAGE_ICU
+	depends on !BR2_arc # icu -> atomic builtins
 	help
 	help
 	  This option enables ICU support in Qt5. This is for example
 	  This option enables ICU support in Qt5. This is for example
 	  needed for Qt5Webkit.
 	  needed for Qt5Webkit.