Unify configuration for the GTK and WPE WebKit packages
cover Unify configuration for the GTK and WPE WebKit packages
Adrian sent a first proposal about this topic, see http://lists.busybox.net/pipermail/buildroot/2019-February/243487.html
Discussion starts in http://lists.busybox.net/pipermail/buildroot/2019-February/243488.html
So, here, my minimalist alternative (but aligned with the Buildroot policy) :
the common part is limited to the variables BR2_PACKAGE_[WPE]WEBKIT[GTK]_ARCH_SUPPORTS[_JIT] in Config.in files
Francois Perrad (1):
package/[wpe]webkit[gtk]: common config
BR2_PACKAGE_WEBKIT_ARCH_SUPPORT[_JIT]
package/midori/Config.in | 4 ++-- package/webkitgtk/Config.in | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- package/wpewebkit/Config.in | 36 +++------------------------------- package/wpewebkit/wpewebkit.mk | 2 +- 5 files changed, 11 insertions(+), 41 deletions(-)
Signature · 1 line
2.17.1
RFC 1/1 package/[wpe]webkit[gtk]: common config BR2_PACKAGE_WEBKIT_ARCH_SUPPORT[_JIT]
--- package/midori/Config.in | 4 ++-- package/webkitgtk/Config.in | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- package/wpewebkit/Config.in | 36 +++------------------------------- package/wpewebkit/wpewebkit.mk | 2 +- 5 files changed, 11 insertions(+), 41 deletions(-)
package/midori/Config.in +2 -2
@@ -1,5 +1,5 @@ comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ !BR2_TOOLCHAIN_USES_GLIBC
@@ -12,7 +12,7 @@ config BR2_PACKAGE_MIDORI depends on BR2_HOST_GCC_AT_LEAST_4_8 # webkitgtk -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS # GCR can only be used with the X11 backend select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_GRANITE
package/webkitgtk/Config.in +4 -4
@@ -1,4 +1,4 @@ -config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS +config BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS bool # ARM needs BLX, so v5t+, BE completely untested so disabled default y if BR2_arm && !BR2_ARM_CPU_ARMV4
@@ -12,7 +12,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT +config BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS_JIT bool # ARM needs NEON for JIT. default y if BR2_ARM_CPU_HAS_NEON
@@ -29,7 +29,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_HOST_GCC_AT_LEAST_4_8 || \
@@ -43,7 +43,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_LIBGTK3 - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_ENCHANT
package/webkitgtk/webkitgtk.mk +1 -1
@@ -27,7 +27,7 @@ WEBKITGTK_CONF_OPTS = \ -DUSE_LIBHYPHEN=OFF \ -DUSE_WOFF2=ON -ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y) +ifeq ($(BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS_JIT),y) WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON else WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF
package/wpewebkit/Config.in +3 -33
@@ -1,42 +1,12 @@ -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS - bool - # ARM needs BLX, so v5t+, BE completely untested so disabled - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 - default y if BR2_aarch64 || BR2_aarch64_be - default y if BR2_i386 || BR2_x86_64 - # Disabled on MIPS big endian due to sigbus - default y if BR2_mipsel || BR2_mips64el - # Disabled on PowerPC pending runtime testing - # Disabled on SuperH because of segfault - depends on BR2_USE_MMU # libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT - bool - # ARM needs NEON for JIT. - default y if BR2_ARM_CPU_HAS_NEON - # AArch64 is supported upstream but not well tested on big-endian mode. - default y if BR2_aarch64 - # i386 & x86_64 don't have any special requirements. - default y if BR2_i386 - default y if BR2_x86_64 - # JIT is known not to work on MIPS64. - # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6 - # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258 - # The MIPS support is completely untested in big-endian mode. - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 - comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8, host gcc >= 4.8" - depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 comment "wpewebkit needs an OpenGL ES w/ EGL backend" - depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL
@@ -51,7 +21,7 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy - depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_HARFBUZZ
package/wpewebkit/wpewebkit.mk +1 -1
@@ -21,7 +21,7 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF -ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y) +ifeq ($(BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS_JIT),y) WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON else WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF
Signature · 1 line
2.17.1
RFC 1/1 package/[wpe]webkit[gtk]: common config BR2_PACKAGE_WEBKIT_ARCH_SUPPORT[_JIT]
Hello Fran?ois,
Quoted 8 lines · On Sat, 30 Mar 2019 11:19:40 +0100 Francois Perrad <[email protected]> wrote:
Signed-off-by Francois Perrad <[email protected]>--- package/midori/Config.in | 4 ++-- package/webkitgtk/Config.in | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- package/wpewebkit/Config.in | 36 +++------------------------------- package/wpewebkit/wpewebkit.mk | 2 +- 5 files changed, 11 insertions(+), 41 deletions(-)
Thanks for this alternate proposal, but after discussing with Yann and Arnout on IRC, the three of us agreed that we didn't like seeing one package defining options that don't match this package name, and then have those options re-used by another package.
We are also not entirely convinced by Adrian's proposal either. Arnout is going to reply separately about this.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com