Update WebKitGTK, and enable with Musl
cover Update WebKitGTK, and enable with Musl
Hello!
This bring in WebKitGTK to the most recent release and enables using it with the Musl libc. Using WebKit with Musl is now supported by upstream packages so no patches are needed--same as for the recent WPE WebKit update to 2.32.1
Regards,
-Adrian
Adrian Perez de Castro (2):
package/webkitgtk: bump to version 2.32.1 package/webkitgtk: allow building with the musl libc
package/webkitgtk/Config.in | 11 +++++++---- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 package/webkitgtk: bump to version 2.32.1
Update to a new major release which bring in improvements and a few new features. Release notes:
https://webkitgtk.org/2021/03/26/webkitgtk2.32.0-released.html
https://webkitgtk.org/2021/05/10/webkitgtk2.32.1-released.html
None of the new features in WebKitGTK 2.32.x need additional dependencies.
--- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
package/webkitgtk/webkitgtk.hash +4 -4
@@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.30.6.tar.xz.sums -md5 11148c4ed400c58fe330ac94208cbc4d webkitgtk-2.30.6.tar.xz -sha1 aaaf9b0f1780f3eae104ae0d3ad15b3e19cf6e8d webkitgtk-2.30.6.tar.xz -sha256 50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e webkitgtk-2.30.6.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.32.1.tar.xz.sums +md5 b12790ae1209e1d5848aeb4fb70994db webkitgtk-2.32.1.tar.xz +sha1 c8c507d3c98c891ea5bfcfb6407320959dc77a2b webkitgtk-2.32.1.tar.xz +sha256 136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917 webkitgtk-2.32.1.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
package/webkitgtk/webkitgtk.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.30.6 +WEBKITGTK_VERSION = 2.32.1 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES
Signature · 1 line
2.31.1
Yann E. MORIN
AppliedPATCH 1/2 package/webkitgtk: bump to version 2.32.1
Adrian, All,
On 2021-05-18 22:05 +0300, Adrian Perez de Castro spake thusly:
Quoted 10 lines
Update to a new major release which bring in improvements and a few new features. Release notes:
https://webkitgtk.org/2021/03/26/webkitgtk2.32.0-released.html
https://webkitgtk.org/2021/05/10/webkitgtk2.32.1-released.htmlNone of the new features in WebKitGTK 2.32.x need additional dependencies.
Signed-off-by Adrian Perez de Castro <[email protected]>
Applied to next, thanks.
Regards,
Yann E. MORIN.
Quoted 41 lines
--- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)package/webkitgtk/webkitgtk.hash +4
-4@@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.30.6.tar.xz.sums -md5 11148c4ed400c58fe330ac94208cbc4d webkitgtk-2.30.6.tar.xz -sha1 aaaf9b0f1780f3eae104ae0d3ad15b3e19cf6e8d webkitgtk-2.30.6.tar.xz -sha256 50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e webkitgtk-2.30.6.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.32.1.tar.xz.sums +md5 b12790ae1209e1d5848aeb4fb70994db webkitgtk-2.32.1.tar.xz +sha1 c8c507d3c98c891ea5bfcfb6407320959dc77a2b webkitgtk-2.32.1.tar.xz +sha256 136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917 webkitgtk-2.32.1.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLEpackage/webkitgtk/webkitgtk.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.30.6 +WEBKITGTK_VERSION = 2.32.1 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YESSignature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 2/2 package/webkitgtk: allow building with the musl libc
In reply to Adrian Perez de CastroWebKitGTK 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.
--- package/webkitgtk/Config.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
package/webkitgtk/Config.in +7 -4
@@ -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 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_HOST_GCC_AT_LEAST_4_9 - depends on BR2_USE_MMU 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
Signature · 1 line
2.31.1
PATCH 2/2 package/webkitgtk: allow building with the musl libc
Adrian, All,
On 2021-05-18 22:05 +0300, Adrian Perez de Castro spake thusly:
Quoted 15 lines
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 <[email protected]>--- package/webkitgtk/Config.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)package/webkitgtk/Config.in +0
-0
package/webkitgtk/Config.in config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS · line 19
Quoted 10 lines
package/webkitgtk/Config.in +3
-2@@ -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
package/webkitgtk/Config.in config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS · line 21
Quoted 3 lines
package/webkitgtk/Config.in +0
-1!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?
Regards,
Yann E. MORIN.
Quoted 20 lines
package/webkitgtk/Config.in +4
-1config 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_CAIROSignature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 2/2 package/webkitgtk: allow building with the musl libc
Hi!
Quoted 19 lines · On Wed, 19 May 2021 11:56:11 +0200 "Yann E. MORIN" <[email protected]>…
On 2021-05-18 22:05 +0300, Adrian Perez de Castro spake thusly:
Quoted 18 lines
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 <[email protected]>--- package/webkitgtk/Config.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)package/webkitgtk/Config.in +0
-0@@ -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
Quoted 10 lines
package/webkitgtk/Config.in config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS · line 19
Quoted 7 lines
package/webkitgtk/Config.in +3
-2-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:-)
Quoted 5 lines
package/webkitgtk/Config.in config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS · line 21
Quoted 3 lines
package/webkitgtk/Config.in +0
-1!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_HOST_GCC_AT_LEAST_4_9 - depends on BR2_USE_MMUHow 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
Quoted 19 lines
Regards,
Yann E. MORIN.Quoted 16 lines
package/webkitgtk/Config.in +4
-1config 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_CAIROSignature · 1 line
2.31.1
Quoted 12 lines
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildrootSignature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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.asc>
PATCH 2/2 package/webkitgtk: allow building with the musl libc
Quoted 39 lines · On Fri, 21 May 2021 00:08:33 +0300 Adrian Perez de Castro <[email protected]>…
Hi!
Quoted 19 lines · On Wed, 19 May 2021 11:56:11 +0200 "Yann E. MORIN" <[email protected]>…
On 2021-05-18 22:05 +0300, Adrian Perez de Castro spake thusly:
Quoted 18 lines
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 <[email protected]>--- package/webkitgtk/Config.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)package/webkitgtk/Config.in +0
-0@@ -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 # libgcryptQuoted 10 lines
package/webkitgtk/Config.in config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS · line 19
Quoted 7 lines
package/webkitgtk/Config.in +3
-2-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:-)
Quoted 8 lines
Quoted 5 lines
package/webkitgtk/Config.in config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS · line 21
Quoted 3 lines
package/webkitgtk/Config.in +0
-1!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_HOST_GCC_AT_LEAST_4_9 - depends on BR2_USE_MMUHow 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.
Oh wait, on second thought, I now understand why it's there: to avoid even showing the comment for MMU-less targets. I will just remove this edit from the commit.
Quoted 34 lines
Cheers,
-AdrianQuoted 31 lines
Regards,
Yann E. MORIN.Quoted 20 lines
package/webkitgtk/Config.in +4
-1config 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_CAIROSignature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildrootSignature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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/08dd2228/attachment.asc>
PATCH 1/1 package/webkitgtk: allow building with musl and uclibc
In reply to Adrian Perez de CastroWebKitGTK 2.32.1 includes fixes for building with the Musl libc, which also makes it possible to use uClibc as well, therefore arrange dependencies to allow selecting the package any of the C libraries is in use. This is done by making the dependencies be more granular, basically following what the wpewebkit package does.
In order to make make it build against uClibc a small patch that has been submitted to the upstream's Bugzilla is needed.
--- ...0001-Support-building-against-uClibc.patch | 76 +++++++++++++++++++ package/webkitgtk/Config.in | 10 ++- 2 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 package/webkitgtk/0001-Support-building-against-uClibc.patch
package/webkitgtk/0001-Support-building-against-uClibc.patch new file +76 -0
@@ -0,0 +1,76 @@ +From 624d3b6a99778443e35fb260bef50a3969df9215 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <[email protected]> +Date: Wed, 26 May 2021 01:24:59 +0300 +Subject: [PATCH] Support building against uClibc + https://bugs.webkit.org/show_bug.cgi?id=226244 + +Reviewed by NOBODY (OOPS!). + +Source/JavaScriptCore: + +* assembler/MacroAssemblerARM64.cpp: +(getauxval): Provide a fallback implementation of getauxval() for +systems which do not provide <sys/auxv.h>, like those using uClibc +as their C library. + +Source/WTF: + +* wtf/PlatformRegisters.h: Use the <sys/ucontext.h> header instead of +<ucontext.h>, which is enough to gain access to the type definitions +for CPU registers and is available on every libc. On the other hand, +uClibc does not have <ucontext.h>, so this fixes the build in that +case. + +Signed-off-by: Adrian Perez de Castro <[email protected]> +[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=226244] +--- + .../assembler/MacroAssemblerARM64.cpp | 18 ++++++++++++++++++ + Source/WTF/wtf/PlatformRegisters.h | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp +index 9e5c5147ea0..d20e632d825 100644 +--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp ++++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp +@@ -34,7 +34,25 @@ + + #if OS(LINUX) + #include <asm/hwcap.h> ++#if __has_include(<sys/auxv.h>) + #include <sys/auxv.h> ++#else ++#include <linux/auxvec.h> ++// Provide an implementation for C libraries which do not ship one. ++static unsigned long getauxval(unsigned long type) ++{ ++ char** env = environ; ++ while (*env++) { /* no-op */ } ++ ++ for (auto* auxv = reinterpret_cast<unsigned long*>(env); *auxv != AT_NULL; auxv += 2) { ++ if (*auxv == type) ++ return auxv[1]; ++ } ++ ++ errno = ENOENT; ++ return 0; ++} ++#endif + #endif + + namespace JSC { +diff --git a/Source/WTF/wtf/PlatformRegisters.h b/Source/WTF/wtf/PlatformRegisters.h +index d26ef985169..e7f15b7eb62 100644 +--- a/Source/WTF/wtf/PlatformRegisters.h ++++ b/Source/WTF/wtf/PlatformRegisters.h +@@ -35,7 +35,7 @@ + #elif OS(WINDOWS) + #include <windows.h> + #else +-#include <ucontext.h> ++#include <sys/ucontext.h> + #endif + + namespace WTF { +-- +2.31.1 +
package/webkitgtk/Config.in +7 -3
@@ -12,20 +12,24 @@ 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 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU 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
Signature · 1 line
2.31.1
Yann E. MORIN
AppliedPATCH 1/1 package/webkitgtk: allow building with musl and uclibc
Adrian, All,
On 2021-05-26 21:24 +0300, Adrian Perez de Castro spake thusly:
Quoted 10 lines
WebKitGTK 2.32.1 includes fixes for building with the Musl libc, which also makes it possible to use uClibc as well, therefore arrange dependencies to allow selecting the package any of the C libraries is in use. This is done by making the dependencies be more granular, basically following what the wpewebkit package does.
In order to make make it build against uClibc a small patch that has been submitted to the upstream's Bugzilla is needed.
Signed-off-by Adrian Perez de Castro <[email protected]>
Applied to next, thanks.
Same tweaks as for the wpewebkit patch.
Regards,
Yann E. MORIN.
Quoted 127 lines
--- ...0001-Support-building-against-uClibc.patch | 76 +++++++++++++++++++ package/webkitgtk/Config.in | 10 ++- 2 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 package/webkitgtk/0001-Support-building-against-uClibc.patchpackage/webkitgtk/0001-Support-building-against-uClibc.patch new file +76
-0@@ -0,0 +1,76 @@ +From 624d3b6a99778443e35fb260bef50a3969df9215 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <[email protected]> +Date: Wed, 26 May 2021 01:24:59 +0300 +Subject: [PATCH] Support building against uClibc + https://bugs.webkit.org/show_bug.cgi?id=226244 + +Reviewed by NOBODY (OOPS!). + +Source/JavaScriptCore: + +* assembler/MacroAssemblerARM64.cpp: +(getauxval): Provide a fallback implementation of getauxval() for +systems which do not provide <sys/auxv.h>, like those using uClibc +as their C library. + +Source/WTF: + +* wtf/PlatformRegisters.h: Use the <sys/ucontext.h> header instead of +<ucontext.h>, which is enough to gain access to the type definitions +for CPU registers and is available on every libc. On the other hand, +uClibc does not have <ucontext.h>, so this fixes the build in that +case. + +Signed-off-by: Adrian Perez de Castro <[email protected]> +[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=226244] +--- + .../assembler/MacroAssemblerARM64.cpp | 18 ++++++++++++++++++ + Source/WTF/wtf/PlatformRegisters.h | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp +index 9e5c5147ea0..d20e632d825 100644 +--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp ++++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp +@@ -34,7 +34,25 @@ + + #if OS(LINUX) + #include <asm/hwcap.h> ++#if __has_include(<sys/auxv.h>) + #include <sys/auxv.h> ++#else ++#include <linux/auxvec.h> ++// Provide an implementation for C libraries which do not ship one. ++static unsigned long getauxval(unsigned long type) ++{ ++ char** env = environ; ++ while (*env++) { /* no-op */ } ++ ++ for (auto* auxv = reinterpret_cast<unsigned long*>(env); *auxv != AT_NULL; auxv += 2) { ++ if (*auxv == type) ++ return auxv[1]; ++ } ++ ++ errno = ENOENT; ++ return 0; ++} ++#endif + #endif + + namespace JSC { +diff --git a/Source/WTF/wtf/PlatformRegisters.h b/Source/WTF/wtf/PlatformRegisters.h +index d26ef985169..e7f15b7eb62 100644 +--- a/Source/WTF/wtf/PlatformRegisters.h ++++ b/Source/WTF/wtf/PlatformRegisters.h +@@ -35,7 +35,7 @@ + #elif OS(WINDOWS) + #include <windows.h> + #else +-#include <ucontext.h> ++#include <sys/ucontext.h> + #endif + + namespace WTF { +-- +2.31.1 +package/webkitgtk/Config.in +7
-3@@ -12,20 +12,24 @@ 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 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU 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_CAIROSignature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/webkitgtk: allow building with musl and uclibc
Hi,
Quoted 7 lines · On Fri, 04 Jun 2021 23:15:49 +0200 "Yann E. MORIN" <[email protected]>…
On 2021-05-26 21:24 +0300, Adrian Perez de Castro spake thusly:
Quoted 6 lines
WebKitGTK 2.32.1 includes fixes for building with the Musl libc, which also makes it possible to use uClibc as well, therefore arrange dependencies to allow selecting the package any of the C libraries is in use. This is done by making the dependencies be more granular, basically following what the wpewebkit package does.
Quoted 8 lines
Quoted 4 lines
In order to make make it build against uClibc a small patch that has been submitted to the upstream's Bugzilla is needed.
Signed-off-by Adrian Perez de Castro <[email protected]>Applied to next, thanks.
Same tweaks as for the wpewebkit patch.
Wonderful, thanks! \o/
-Adrian
-------------- 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/20210608/9ebb50f4/attachment.asc>