webkit: disable on < ARMv5t

webkit needs the ARM blx instruction, which is only available on >=
ARMv5t, so we have to make sure the webkit package cannot be enabled
on < ARMv5t. In order to achieve this, this commit introduces the
BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS hidden Config.in knob, which avoids
duplicating all over the place the complex architecture dependencies
of webkit.

Fixes:

  http://autobuild.buildroot.org/results/fdf/fdf8bc7660ac251792d0542d2729ea22753d3789/build-end.log

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

diff --git a/package/midori/Config.in b/package/midori/Config.in
index a684376c69f7c9b5828b4bb66f1c13d56f71a7c6..c3b5a1bd273d89e6e086eb6ea12fe44507305747 100644 (file)
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -8,15 +8,13 @@ config BR2_PACKAGE_MIDORI
        depends on BR2_INSTALL_LIBSTDCPP # webkit
        depends on BR2_TOOLCHAIN_HAS_THREADS # webkit -> enchant -> libglib2
        depends on BR2_USE_WCHAR         # webkit
-       depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
-                   BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64) # webkit
+       depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
        help
          Midori is a lightweight web browser based on WebKit
 
          http://software.twotoasts.de/?page=midori
 
 comment "midori needs libgtk2 and a toolchain w/ C++, wchar, threads"
-       depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
-                   BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64)
+       depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
                !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2

diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 0207a6d78c8e6f79ab6b577821aae298ff0c610c..daaec365e00b88f609b35af339fc59865309343c 100644 (file)
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -1,11 +1,18 @@
+config BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
+       bool
+       # ARM needs BLX, so v5t+
+       default y if (BR2_arm || BR2_armeb) && \
+               !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
+       default y if BR2_i386 || BR2_mips || BR2_mipsel || \
+               BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64
+
 config BR2_PACKAGE_WEBKIT
        bool "webkit"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR # enchant -> libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # enchant -> libglib2
        depends on BR2_PACKAGE_LIBGTK2
-       depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
-                   BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64)
+       depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
        select BR2_PACKAGE_CAIRO_PNG
        select BR2_PACKAGE_ENCHANT
        select BR2_PACKAGE_HARFBUZZ
@@ -29,7 +36,6 @@ config BR2_PACKAGE_WEBKIT
          http://webkit.org/
 
 comment "webkit needs libgtk2 and a toolchain w/ C++, wchar, threads"
-       depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
-                   BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64)
+       depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
        depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
                !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS