webkit: disable on < ARMv5t
PATCH 1/1 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
--- package/midori/Config.in | 6 ++---- package/webkit/Config.in | 14 ++++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-)
package/midori/Config.in +2 -4
@@ -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
package/webkit/Config.in +10 -4
@@ -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
Signature · 1 line
1.8.3.2
PATCH 1/1 webkit: disable on < ARMv5t
Quoted 44 lines · Thomas Petazzoni
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_SUPPORTShidden 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 <[email protected]>--- package/midori/Config.in | 6 ++---- package/webkit/Config.in | 14 ++++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-)package/midori/Config.in +2
-4@@ -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_LIBGTK2package/webkit/Config.in +0
-0
package/webkit/Config.in line 7
Quoted 7 lines
package/webkit/Config.in +7
-0@@ -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
We normally write
depends on FOO
depends on BAR
rather than
depends on FOO && BAR
Shouldn't we do the same here?
default y if BR2_i386
default y if BR2_mips
Regards,
Arnout
Quoted 23 lines
package/webkit/Config.in +3
-4+ 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
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/1 webkit: disable on < ARMv5t
Dear Arnout Vandecappelle,
Quoted 18 lines · Arnout Vandecappelle
package/webkit/Config.in line 7
Quoted 12 lines
package/webkit/Config.in +7
-0@@ -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_64We normally write
depends on FOO
depends on BAR
Quoted 8 lines
rather than
depends on FOO && BARShouldn't we do the same here?
default y if
BR2_i386
default y ifBR2_mips
Are you talking about the first line (about ARM), or the second line (for all the other architectures) ?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 webkit: disable on < ARMv5t
Quoted 26 lines · Thomas Petazzoni
Dear Arnout Vandecappelle,
Quoted 22 lines · Arnout Vandecappelle
package/webkit/Config.in line 7
Quoted 12 lines
package/webkit/Config.in +7
-0@@ -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_64We normally write
depends on FOO
depends on BARrather than
depends on FOO && BAR
Quoted 7 lines
Quoted 4 lines
Shouldn't we do the same here?
default y if
BR2_i386
default y ifBR2_mipsAre you talking about the first line (about ARM), or the second line (for all the other architectures) ?
For all the other architectures. That's why it says BR2_i386 and notBR2_arm :-)
For BR2_arm it is not possible because you have an &&. Well, you could
put BR2_arm and BR2_armeb on separate lines but then you have to repeat all the exclusions - not so nice.
Regards,
Arnout
Quoted 3 lines
Thomas
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/1 webkit: disable on < ARMv5t
Dear Arnout Vandecappelle,
Quoted 2 lines · Arnout Vandecappelle
For all the other architectures. That's why it says
BR2_i386and notBR2_arm:-)
Ok.
Quoted 3 lines
For
BR2_armit is not possible because you have an &&. Well, you could
putBR2_armandBR2_armebon separate lines but then you have to repeat all the exclusions - not so nice.
Correct.
But then for the other architectures, it also makes a certain of lines that I really short. I guess it's a matter of taste, I don't really care. Can you submit a patch against master to change this, since the patch has already been merged?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 webkit: disable on < ARMv5t
In reply to Thomas PetazzoniQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
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_SUPPORTShidden Config.in knob, which avoids duplicating all over the place the complex architecture dependencies of webkit.
Quoted 5 lines
Fixes:
http://autobuild.buildroot.org/results/fdf/fdf8bc7660ac251792d0542d2729ea22753d3789/build-end.log
Signed-off-by Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard