diff mbox series

[walnascar] webkitgtk: fix compile failure on qemuriscv64

Message ID 20250717044910.3240530-1-hongxu.jia@windriver.com
State Changes Requested
Delegated to: Steve Sakoman
Headers show
Series [walnascar] webkitgtk: fix compile failure on qemuriscv64 | expand

Commit Message

Hongxu Jia July 17, 2025, 4:49 a.m. UTC 
$ echo 'MACHINE = "qemuriscv64"' >> conf/local.conf
$ bitbake webkitgtk
...
|TOPDIR/tmp/work/riscv64-wrs-linux/webkitgtk/2.48.1/webkitgtk-2.48.1/
Source/WebCore/platform/audio/DenormalDisabler.cpp:95:1: error: expected
',' or ';' before 'DenormalDisabler'
...

Backport a patch from upstream to fix the issue

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 ...5.129-webkitglib-2.48-Broke-non-x86-.patch | 35 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.48.1.bb  |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch

Comments

Steve Sakoman July 18, 2025, 4:46 p.m. UTC | #1 
This patch is breaking musl builds:

ERROR: webkitgtk-2.48.2-r0 do_patch: Applying patch
'0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch' on
target directory
'/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/webkitgtk/2.48.2/webkitgtk-2.48.2'
CmdError('quilt --quiltrc
/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/webkitgtk/2.48.2/recipe-sysroot-native/etc/quiltrc
push', 0, "stdout: Applying patch
0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch
can't find file to patch at input line 24
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 8bee9eb95ae24c6a410f9cd614976f4653d020d9 Mon Sep 17 00:00:00 2001
|From: Michael Catanzaro <mcatanzaro@redhat.com>
|Date: Wed, 2 Apr 2025 15:01:55 -0500
|Subject: [PATCH] REGRESSION(290945.129@webkitglib/2.48): Broke non-x86,
| non-ARM builds https://bugs.webkit.org/show_bug.cgi?id=287662
|
|Unreviewed stable branch build fix.
|
|* Source/WebCore/platform/audio/DenormalDisabler.cpp:
|
|Canonical link: https://commits.webkit.org/290945.155@webkitglib/2.48
|Signed-off-by: Michael Catanzaro <mcatanzaro@redhat.com>
|
|Upstream-Status: Backport
[https://github.com/WebKit/WebKit/commit/8bee9eb95ae24c6a410f9cd614976f4653d020d9]
|Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|---
| Source/WebCore/platform/audio/DenormalDisabler.cpp | 2 +-
| 1 file changed, 1 insertion(+), 1 deletion(-)
|
|diff --git a/Source/WebCore/platform/audio/DenormalDisabler.cpp
b/Source/WebCore/platform/audio/DenormalDisabler.cpp
|index 35715e663ce7..44ba08a33d5d 100644
|--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp
|+++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
Patch 0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch
does not apply (enforce with -f)

Sample full log:

https://autobuilder.yoctoproject.org/valkyrie/?#/builders/6/builds/2084/steps/11/logs/stdio

Steve

On Wed, Jul 16, 2025 at 9:49 PM hongxu via lists.openembedded.org
<hongxu.jia=eng.windriver.com@lists.openembedded.org> wrote:
>
> $ echo 'MACHINE = "qemuriscv64"' >> conf/local.conf
> $ bitbake webkitgtk
> ...
> |TOPDIR/tmp/work/riscv64-wrs-linux/webkitgtk/2.48.1/webkitgtk-2.48.1/
> Source/WebCore/platform/audio/DenormalDisabler.cpp:95:1: error: expected
> ',' or ';' before 'DenormalDisabler'
> ...
>
> Backport a patch from upstream to fix the issue
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  ...5.129-webkitglib-2.48-Broke-non-x86-.patch | 35 +++++++++++++++++++
>  meta/recipes-sato/webkit/webkitgtk_2.48.1.bb  |  1 +
>  2 files changed, 36 insertions(+)
>  create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch
> new file mode 100644
> index 0000000000..191f1aabf0
> --- /dev/null
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch
> @@ -0,0 +1,35 @@
> +From 8bee9eb95ae24c6a410f9cd614976f4653d020d9 Mon Sep 17 00:00:00 2001
> +From: Michael Catanzaro <mcatanzaro@redhat.com>
> +Date: Wed, 2 Apr 2025 15:01:55 -0500
> +Subject: [PATCH] REGRESSION(290945.129@webkitglib/2.48): Broke non-x86,
> + non-ARM builds https://bugs.webkit.org/show_bug.cgi?id=287662
> +
> +Unreviewed stable branch build fix.
> +
> +* Source/WebCore/platform/audio/DenormalDisabler.cpp:
> +
> +Canonical link: https://commits.webkit.org/290945.155@webkitglib/2.48
> +Signed-off-by: Michael Catanzaro <mcatanzaro@redhat.com>
> +
> +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/8bee9eb95ae24c6a410f9cd614976f4653d020d9]
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +---
> + Source/WebCore/platform/audio/DenormalDisabler.cpp | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Source/WebCore/platform/audio/DenormalDisabler.cpp b/Source/WebCore/platform/audio/DenormalDisabler.cpp
> +index 35715e663ce7..44ba08a33d5d 100644
> +--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp
> ++++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp
> +@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler()
> +     }
> + }
> + #else
> +-DenormalDisabler::DenormalDisabler() = default
> ++DenormalDisabler::DenormalDisabler() = default;
> + DenormalDisabler::~DenormalDisabler() = default;
> + #endif
> +
> +--
> +2.49.0
> +
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb
> index 58d0a11202..d210b3d671 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb
> @@ -18,6 +18,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
>             file://sys_futex.patch \
>             file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
>             file://fix-ftbfs-riscv64.patch \
> +           file://0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch \
>             "
>  SRC_URI[sha256sum] = "98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f"
>
> --
> 2.49.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#220515): https://lists.openembedded.org/g/openembedded-core/message/220515
> Mute This Topic: https://lists.openembedded.org/mt/114198641/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch
new file mode 100644
index 0000000000..191f1aabf0
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch
@@ -0,0 +1,35 @@ 
+From 8bee9eb95ae24c6a410f9cd614976f4653d020d9 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Wed, 2 Apr 2025 15:01:55 -0500
+Subject: [PATCH] REGRESSION(290945.129@webkitglib/2.48): Broke non-x86,
+ non-ARM builds https://bugs.webkit.org/show_bug.cgi?id=287662
+
+Unreviewed stable branch build fix.
+
+* Source/WebCore/platform/audio/DenormalDisabler.cpp:
+
+Canonical link: https://commits.webkit.org/290945.155@webkitglib/2.48
+Signed-off-by: Michael Catanzaro <mcatanzaro@redhat.com>
+
+Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/8bee9eb95ae24c6a410f9cd614976f4653d020d9]
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Source/WebCore/platform/audio/DenormalDisabler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebCore/platform/audio/DenormalDisabler.cpp b/Source/WebCore/platform/audio/DenormalDisabler.cpp
+index 35715e663ce7..44ba08a33d5d 100644
+--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp
++++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp
+@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler()
+     }
+ }
+ #else
+-DenormalDisabler::DenormalDisabler() = default
++DenormalDisabler::DenormalDisabler() = default;
+ DenormalDisabler::~DenormalDisabler() = default;
+ #endif
+ 
+-- 
+2.49.0
+
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb
index 58d0a11202..d210b3d671 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb
@@ -18,6 +18,7 @@  SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://sys_futex.patch \
            file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
            file://fix-ftbfs-riscv64.patch \
+           file://0001-REGRESSION-290945.129-webkitglib-2.48-Broke-non-x86-.patch \
            "
 SRC_URI[sha256sum] = "98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f"