From: <mingli.yu@eng.windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH v2 4/4] lttng-tools: Remove the scope resolution operator with musl
Date: Sun, 20 Jul 2025 17:00:10 +0800 [thread overview]
Message-ID: <20250720090010.3122861-4-mingli.yu@eng.windriver.com> (raw)
In-Reply-To: <20250720090010.3122861-1-mingli.yu@eng.windriver.com>
From: Mingli Yu <mingli.yu@windriver.com>
Remove the scope resolution operator :: in musl build to fix the below
build failure.
| ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp:18:31: error: expected id-expression before numeric constant
| 18 | int flags = ::EFD_CLOEXEC;
| | ^~~~~~~~~~~
| ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp:21:36: error: expected id-expression before numeric constant
| 21 | flags |= ::EFD_SEMAPHORE;
| |
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
...Remove-the-scope-resolution-operator.patch | 41 +++++++++++++++++++
.../lttng/lttng-tools_2.14.0.bb | 2 +
2 files changed, 43 insertions(+)
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch
new file mode 100644
index 00000000000..dac5002f097
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch
@@ -0,0 +1,41 @@
+From da83d31a8dd555c28eb27bd7a7d3c53b51d5f276 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Sun, 20 Jul 2025 16:37:57 +0800
+Subject: [PATCH] eventfd.cpp: Remove the scope resolution operator
+
+Remove the scope resolution operator :: to fix the below build failure
+with musl.
+ | ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp:18:31: error: expected id-expression before numeric constant
+ | 18 | int flags = ::EFD_CLOEXEC;
+ | | ^~~~~~~~~~~
+ | ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp:21:36: error: expected id-expression before numeric constant
+ | 21 | flags |= ::EFD_SEMAPHORE;
+ | | ^~~~~~~~~~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ src/common/eventfd.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/common/eventfd.cpp b/src/common/eventfd.cpp
+index fe5b549..3379b0b 100644
+--- a/src/common/eventfd.cpp
++++ b/src/common/eventfd.cpp
+@@ -15,10 +15,10 @@
+
+ lttng::eventfd::eventfd(bool use_semaphore_semantics, std::uint64_t initial_value) :
+ file_descriptor([use_semaphore_semantics, initial_value]() {
+- int flags = ::EFD_CLOEXEC;
++ int flags = EFD_CLOEXEC;
+
+ if (use_semaphore_semantics) {
+- flags |= ::EFD_SEMAPHORE;
++ flags |= EFD_SEMAPHORE;
+ }
+
+ const auto raw_fd = ::eventfd(initial_value, flags);
+--
+2.34.1
+
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb
index da3bdd4052f..989c963c1f8 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb
@@ -48,6 +48,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
file://0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch \
"
+SRC_URI:append:libc-musl = " file://0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch"
+
SRC_URI[sha256sum] = "d8c39c26cec13b7bd82551cd52a22efc358b888e36ebcf9c1b60ef1c3a3c2fd3"
inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
--
2.34.1
next prev parent reply other threads:[~2025-07-20 9:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-20 9:00 [PATCH v2 1/4] lttng-ust: Upgrade 2.13.9 -> 2.14.0 mingli.yu
2025-07-20 9:00 ` [PATCH v2 2/4] babeltrace2: Enable python plugins mingli.yu
2025-07-21 8:09 ` [OE-core] " Joao Marcos Costa
2025-07-23 2:10 ` Yu, Mingli
2025-07-23 5:51 ` Mathieu Dubois-Briand
2025-07-24 5:58 ` Yu, Mingli
2025-07-24 9:53 ` Mathieu Dubois-Briand
2025-07-20 9:00 ` [PATCH v2 3/4] lttng-tools: Upgrade 2.13.15 -> 2.14.0 mingli.yu
2025-07-20 9:00 ` mingli.yu [this message]
2025-07-21 9:39 ` [OE-core] [PATCH v2 4/4] lttng-tools: Remove the scope resolution operator with musl Alexander Kanavin
2025-07-23 2:13 ` Yu, Mingli
2025-07-23 10:08 ` Alexander Kanavin
2025-07-22 1:23 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250720090010.3122861-4-mingli.yu@eng.windriver.com \
--to=mingli.yu@eng.windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox