Skip to contentSkip to conversation

babeltrace2: Fix build with clang on 32bit hosts

PATCH In review Khem Raj 2 participants 3 messages Mar 21, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 babeltrace2: Fix build with clang on 32bit hosts

clang-20 unveils more build issues

---
 ...ob_get_length-return-size_t-instead-.patch | 37 +++++++++++++++++++
 .../recipes-kernel/lttng/babeltrace2_2.1.0.bb |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch
meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch new file +37 -0
new file mode 100644
index 00000000000..d923437a2ab
@@ -0,0 +1,37 @@
+From 1b514ab2e878216426acc493eeab96088576faf9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 20 Mar 2025 18:10:08 -0700
+Subject: [PATCH] Make bt_field_blob_get_length return size_t instead of
+ uint64_t
+
+Fixes errors e.g.
+| ../../git/src/cpp-common/bt2/field.hpp:1139:82: error: non-constant-expression cannot be narrowed from type 'std::uint64_t' (aka 'unsigned long long') to 'size_type' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
+|  1139 |         return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
+|       |                                                                                  ^~~~~~~~~~~~~~
+| ../../git/src/plugins/ctf/common/src/msg-iter.cpp:744:56: note: in instantiation of member function 'bt2::CommonBlobField<bt_field>::data' requested here
+|   744 |     std::memcpy(&this->_stackTopCurSubField().asBlob().data()[_mCurBlobFieldDataOffset],
+|       |                                                        ^
+| ../../git/src/cpp-common/bt2/field.hpp:1139:82: note: insert an explicit cast to silence this issue
+|  1139 |         return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
+|       |                                                                                  ^~~~~~~~~~~~~~
+|       |                                                                                  static_cast<size_type>( )
+
+Upstream-Status: Submitted [https://github.com/efficios/babeltrace/pull/120]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/cpp-common/bt2/field.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cpp-common/bt2/field.hpp b/src/cpp-common/bt2/field.hpp
+index 8b291f7a1..cbfff84f0 100644
+--- a/src/cpp-common/bt2/field.hpp
++++ b/src/cpp-common/bt2/field.hpp
+@@ -1139,7 +1139,7 @@ public:
+         return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
+     }
+ 
+-    std::uint64_t length() const noexcept
++    std::size_t length() const noexcept
+     {
+         return bt_field_blob_get_length(this->libObjPtr());
+     }
meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb +1 -0
index bf9df2a32dd..a9a3a9961be 100644
@@ -12,6 +12,7 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=http
            file://0001-Make-manpages-multilib-identical.patch \
            file://0001-tests-fix-test-applications-in-cpp-common.patch \
            file://0001-tests-set-the-correct-plugin-directory.patch \
+           file://0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch \
            "
 SRCREV = "e61d41ff3c3ac6a123930d4e60cf710ff9ea18e0"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
author
#1 lore raw

PATCH 2/2 webkitgtk: Fix build on RISCV

---
 ...-on-RISCV-https-bugs.webkit.org-show.patch | 30 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.48.0.bb  |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch new file +30 -0
new file mode 100644
index 00000000000..40a71330522
@@ -0,0 +1,30 @@
+From 984538dcce7b184269efc1e1b0fb78e1cb932b5d Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 21 Mar 2025 01:21:22 -0700
+Subject: [PATCH] Fix build errors on RISCV
+ https://bugs.webkit.org/show_bug.cgi?id=290163
+
+Reviewed by NOBODY (OOPS!).
+
+Include c++ header <system_error> for std::error_code.
+
+* Source/WebCore/contentextensions/ContentExtensionActions.h: Include system_error
+
+Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/42802]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ Source/WebCore/contentextensions/ContentExtensionActions.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/contentextensions/ContentExtensionActions.h b/Source/WebCore/contentextensions/ContentExtensionActions.h
+index 0b75d2e1df78..61cb33c94ce8 100644
+--- a/Source/WebCore/contentextensions/ContentExtensionActions.h
++++ b/Source/WebCore/contentextensions/ContentExtensionActions.h
+@@ -28,6 +28,7 @@
+ #if ENABLE(CONTENT_EXTENSIONS)
+ 
+ #include "ContentExtensionStringSerialization.h"
++#include <system_error>
+ #include <wtf/JSONValues.h>
+ #include <wtf/Hasher.h>
+ 
meta/recipes-sato/webkit/webkitgtk_2.48.0.bb +1 -0
index bfd33835d1f..6eb80da1dea 100644
@@ -18,6 +18,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://sys_futex.patch \
            file://0001-EnumTraits.h-error-no-matching-function-for-call-to-.patch \
            file://0001-Cherry-pick-292304-main-7ffc29624258-.-https-bugs.we.patch \
+           file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
            "
 SRC_URI[sha256sum] = "94904a55cf12d44a4e36ceadafff02d46da73d76be9b4769f34cbfdf0eebf88e"
 
#2 lore raw

Patchtest results for [PATCH 2/2] webkitgtk: Fix build on RISCV

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/2-2-webkitgtk-Fix-build-on-RISCV.patch

FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!