deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

webkit: disable on < ARMv5t

Browse source 
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>
This commit is contained in:
Thomas Petazzoni 2014-02-19 23:08:50 +01:00 committed by Peter Korsgaard
parent 3c150f893d
commit b614b25156
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/midori/Config.in
View file

@ -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

14
package/webkit/Config.in
View file

@ -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