diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in index 033742c8f8..8d63e5e6d1 100644 --- a/package/beecrypt/Config.in +++ b/package/beecrypt/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_BEECRYPT bool "beecrypt" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ - !BR2_arc + !BR2_arc && !BR2_BINFMT_FLAT help Beecrypt is a general-purpose cryptography library. @@ -13,4 +13,5 @@ comment "beecrypt needs a toolchain w/ threads" comment "beecrypt C++ support needs a toolchain w/ wchar" depends on !BR2_arc + depends on !BR2_BINFMT_FLAT 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 2df83ba42d..c88ae1ed82 100644 --- a/package/cppcms/Config.in +++ b/package/cppcms/Config.in @@ -25,6 +25,7 @@ if BR2_PACKAGE_CPPCMS config BR2_PACKAGE_CPPCMS_ICU bool "enable icu support" depends on !BR2_arc # icu -> atomic builtins + depends on !BR2_BINFMT_FLAT # icu 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 b736b438d8..9a278942f8 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -3,6 +3,10 @@ config BR2_PACKAGE_ICU depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + # icu does some funky things by generating by itself an ELF + # file, and it cannot easily be changed to generate FLAT + # format. + depends on !BR2_BINFMT_FLAT depends on !BR2_arc # atomic builtins help International Components for Unicode. @@ -11,5 +15,6 @@ config BR2_PACKAGE_ICU comment "icu needs a toolchain w/ C++, wchar, threads" depends on !BR2_arc + depends on !BR2_BINFMT_FLAT 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 df020479b3..463334b3ac 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -162,11 +162,13 @@ config BR2_PACKAGE_PHP_EXT_INTL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on !BR2_arc # icu -> atomic builtins + depends on !BR2_BINFMT_FLAT # icu help Internationalization support comment "intl support needs a toolchain w/ C++, wchar" depends on !BR2_arc + depends on !BR2_BINFMT_FLAT 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 2fca9d26da..5c404d1e62 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -189,6 +189,7 @@ config BR2_PACKAGE_QT5BASE_ICU bool "Enable ICU support" select BR2_PACKAGE_ICU depends on !BR2_arc # icu -> atomic builtins + depends on !BR2_BINFMT_FLAT # icu help This option enables ICU support in Qt5. This is for example needed for Qt5Webkit. diff --git a/package/webkit/Config.in b/package/webkit/Config.in index daaec365e0..45f2058f8d 100644 --- a/package/webkit/Config.in +++ b/package/webkit/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_WEBKIT depends on BR2_TOOLCHAIN_HAS_THREADS # enchant -> libglib2 depends on BR2_PACKAGE_LIBGTK2 depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS + depends on !BR2_BINFMT_FLAT # icu select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_ENCHANT select BR2_PACKAGE_HARFBUZZ