Commit 19237110 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/icu: use the new ARCH_HAS_ATOMICS as dependency 



And propagate to the reverse dependencies of icu.
Also, fix beecrypt's comment: only the C++ support needs atomics.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Anton Kolesov <Anton.Kolesov@synopsys.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 1b5f0fc8

package/beecrypt/Config.in

+6 −6
Original line number Diff line number Diff line 
comment "beecrypt needs a toolchain w/ threads, atomic intrinsics"

	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS

comment "beecrypt needs a toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS



config BR2_PACKAGE_BEECRYPT

	bool "beecrypt"
@@ -15,15 +15,15 @@ config BR2_PACKAGE_BEECRYPT_CPP 
	bool "C++ support"

	depends on BR2_INSTALL_LIBSTDCPP

	depends on BR2_USE_WCHAR # icu

	depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # icu

	depends on !BR2_BINFMT_FLAT # icu

	depends on BR2_ARCH_HAS_ATOMICS # icu

	select BR2_PACKAGE_ICU

	help

	  Enable C++ support. This pulls in the (large) icu package.



comment "C++ support needs a toolchain w/ wchar, atomic intrinsics"

comment "C++ support needs a toolchain w/ wchar"

	depends on !BR2_BINFMT_FLAT

	depends on BR2_INSTALL_LIBSTDCPP && (!BR2_USE_WCHAR || \

		!BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS)

	depends on BR2_ARCH_HAS_ATOMICS

	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR



endif # BR2_PACKAGE_BEECRYPT

package/cppcms/Config.in

+4 −3
Original line number Diff line number Diff line
@@ -26,14 +26,15 @@ config BR2_PACKAGE_CPPCMS_ICU 
	bool "enable icu support"

	depends on !BR2_BINFMT_FLAT # icu

	depends on BR2_USE_WCHAR # icu

	depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # icu

	depends on BR2_ARCH_HAS_ATOMICS # icu

	select BR2_PACKAGE_ICU

	help

	  Using ICU allows advanced localization features into CppCMS,

	  in another hand ICU is heavier than iconv.



comment "icu support needs a toolchain w/ wchar, atomic intrinsics"

	depends on !BR2_BINFMT_FLAT || !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS

comment "icu support needs a toolchain w/ wchar"

	depends on !BR2_BINFMT_FLAT

	depends on BR2_ARCH_HAS_ATOMICS

	depends on !BR2_USE_WCHAR



endif

package/icu/Config.in

+4 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ config BR2_PACKAGE_ICU 
	# file, and it cannot easily be changed to generate FLAT

	# format.

	depends on !BR2_BINFMT_FLAT

	depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS

	depends on BR2_ARCH_HAS_ATOMICS

	help

	  International Components for Unicode.
@@ -25,7 +25,8 @@ config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH 


endif



comment "icu needs a toolchain w/ C++, wchar, threads, atomic intrinsics"

comment "icu needs a toolchain w/ C++, wchar, threads"

	depends on !BR2_BINFMT_FLAT

	depends on BR2_ARCH_HAS_ATOMICS

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \

		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS
 
		!BR2_TOOLCHAIN_HAS_THREADS

package/php/Config.ext

+4 −4
Original line number Diff line number Diff line
@@ -168,14 +168,14 @@ config BR2_PACKAGE_PHP_EXT_INTL 
	depends on BR2_USE_WCHAR

	depends on !BR2_BINFMT_FLAT # icu

	depends on BR2_TOOLCHAIN_HAS_THREADS # icu

	depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # icu

	depends on BR2_ARCH_HAS_ATOMICS # icu

	help

	  Internationalization support



comment "intl support needs a toolchain w/ C++, wchar, threads, atomic intrinsics"

comment "intl support needs a toolchain w/ C++, wchar, threads"

	depends on !BR2_BINFMT_FLAT

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \

		|| !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS

	depends on BR2_ARCH_HAS_ATOMICS

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS



comment "Image processing"

package/qt5/qt5base/Config.in

+1 −4
Original line number Diff line number Diff line
@@ -241,15 +241,12 @@ config BR2_PACKAGE_QT5BASE_DBUS 
config BR2_PACKAGE_QT5BASE_ICU

	bool "Enable ICU support"

	select BR2_PACKAGE_ICU

	depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # icu

	depends on BR2_ARCH_HAS_ATOMICS # icu

	depends on !BR2_BINFMT_FLAT # icu

	help

	  This option enables ICU support in Qt5. This is for example

	  needed for Qt5Webkit.



comment "icu needs a toolchain w/ atomic intrinsics"

	depends on !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS



config BR2_PACKAGE_QT5BASE_TSLIB

	bool "Enable Tslib support"

	depends on !BR2_PREFER_STATIC_LIB # dlopen