diff options
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb | 1 |
2 files changed, 42 insertions, 0 deletions
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 0000000000..02bd1d1db0 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From da83d31a8dd555c28eb27bd7a7d3c53b51d5f276 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Sun, 20 Jul 2025 16:37:57 +0800 | ||
| 4 | Subject: [PATCH] eventfd.cpp: Remove the scope resolution operator | ||
| 5 | |||
| 6 | Remove the scope resolution operator :: to fix the below build failure | ||
| 7 | with musl. | ||
| 8 | | ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp:18:31: error: expected id-expression before numeric constant | ||
| 9 | | 18 | int flags = ::EFD_CLOEXEC; | ||
| 10 | | | ^~~~~~~~~~~ | ||
| 11 | | ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp:21:36: error: expected id-expression before numeric constant | ||
| 12 | | 21 | flags |= ::EFD_SEMAPHORE; | ||
| 13 | | | ^~~~~~~~~~~~~ | ||
| 14 | |||
| 15 | Upstream-Status: Pending [The message to lttng-dev awaits moderator approval] | ||
| 16 | |||
| 17 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 18 | --- | ||
| 19 | src/common/eventfd.cpp | 4 ++-- | ||
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/src/common/eventfd.cpp b/src/common/eventfd.cpp | ||
| 23 | index fe5b549..3379b0b 100644 | ||
| 24 | --- a/src/common/eventfd.cpp | ||
| 25 | +++ b/src/common/eventfd.cpp | ||
| 26 | @@ -15,10 +15,10 @@ | ||
| 27 | |||
| 28 | lttng::eventfd::eventfd(bool use_semaphore_semantics, std::uint64_t initial_value) : | ||
| 29 | file_descriptor([use_semaphore_semantics, initial_value]() { | ||
| 30 | - int flags = ::EFD_CLOEXEC; | ||
| 31 | + int flags = EFD_CLOEXEC; | ||
| 32 | |||
| 33 | if (use_semaphore_semantics) { | ||
| 34 | - flags |= ::EFD_SEMAPHORE; | ||
| 35 | + flags |= EFD_SEMAPHORE; | ||
| 36 | } | ||
| 37 | |||
| 38 | const auto raw_fd = ::eventfd(initial_value, flags); | ||
| 39 | -- | ||
| 40 | 2.34.1 | ||
| 41 | |||
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 66fec08ff3..262bea0748 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb | |||
| @@ -50,6 +50,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ | |||
| 50 | file://lttng-sessiond.service \ | 50 | file://lttng-sessiond.service \ |
| 51 | file://disable-tests.patch \ | 51 | file://disable-tests.patch \ |
| 52 | file://0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch \ | 52 | file://0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch \ |
| 53 | file://0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch \ | ||
| 53 | " | 54 | " |
| 54 | 55 | ||
| 55 | SRC_URI[sha256sum] = "d8c39c26cec13b7bd82551cd52a22efc358b888e36ebcf9c1b60ef1c3a3c2fd3" | 56 | SRC_URI[sha256sum] = "d8c39c26cec13b7bd82551cd52a22efc358b888e36ebcf9c1b60ef1c3a3c2fd3" |
