[Buildroot] [PATCH/next 2/2] package/webkitgtk: allow building with the musl libc
Adrian Perez de Castro
aperez at igalia.com
Thu May 20 21:08:33 UTC 2021
Hi!
On Wed, 19 May 2021 11:56:11 +0200 "Yann E. MORIN" <yann.morin.1998 at free.fr> wrote:
> On 2021-05-18 22:05 +0300, Adrian Perez de Castro spake thusly:
> > WebKitGTK 2.32.1 includes support for building with the musl libc,
> > therefore arrange dependencies to allow selecting the package when
> > a musl system is built. This is done by making the dependencies be
> > more granular, basically following what the wpewebkit package does.
> >
> > Signed-off-by: Adrian Perez de Castro <aperez at igalia.com>
> > ---
> > package/webkitgtk/Config.in | 11 +++++++----
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
> > index 4ea931fde1..18b254dca5 100644
> > --- a/package/webkitgtk/Config.in
> > +++ b/package/webkitgtk/Config.in
> > @@ -12,20 +12,23 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> > depends on BR2_TOOLCHAIN_HAS_SYNC_4
> > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
> >
> > -comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9"
> > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9"
> > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> > + depends on !BR2_BINFMT_FLAT
> > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
> > - !BR2_TOOLCHAIN_USES_GLIBC || \
> > + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
>
> But that also allows uclibc now... Is that intended? If so, this should
> also be mentioned in the commit log
Ah, this is intended, yes. I started with Musl because we landed the needed
fixes in WebKit in the 2.32.1 release and it turns out that uClibc also
benefits from them... and I wrote the patch before even trying an uClibc
build, then forgot to reword it O:-)
> > !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
> > !BR2_HOST_GCC_AT_LEAST_4_9
> > - depends on BR2_USE_MMU
>
> How does that fit with allowing musl?
This is a spurios dependency for the “comment” entry and should have never
been there to begin with. I will split this edit into its own commit.
Cheers,
-Adrian
> Regards,
> Yann E. MORIN.
>
> > config BR2_PACKAGE_WEBKITGTK
> > bool "webkitgtk"
> > + depends on !BR2_STATIC_LIBS # wayland
> > + depends on !BR2_BINFMT_FLAT # icu
> > depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu
> > depends on BR2_INSTALL_LIBSTDCPP
> > + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup
> > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
> > - depends on BR2_TOOLCHAIN_USES_GLIBC
> > + depends on BR2_USE_WCHAR # icu, libsoup
> > depends on BR2_PACKAGE_LIBGTK3
> > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> > select BR2_PACKAGE_CAIRO
> > --
> > 2.31.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210521/64bf9110/attachment-0002.asc>
More information about the buildroot
mailing list