From 486801db070e201b68220c347812fedd8225eb8c Mon Sep 17 00:00:00 2001 From: Devin Steffler Date: Sat, 15 Nov 2025 17:48:26 +0100 Subject: [PATCH] package/lttng-tools: bump to version 2.14.0 The changelog for lttng-tools 2.14.0 can be found here: https://git.lttng.org/?p=lttng-tools.git;a=blob;f=ChangeLog;h=fc88591423cc856360172165418e8ef7159ab24e;hb=refs/heads/stable-2.14 Signed-off-by: Devin Steffler Signed-off-by: Bernd Kuhls [Bernd: bumped to 2.14.0, added patch 0002 to fix musl build, updated link to changelog] Signed-off-by: Thomas Petazzoni --- ...Remove-the-scope-resolution-operator.patch | 48 +++++++++++++++++++ package/lttng-tools/lttng-tools.hash | 4 +- package/lttng-tools/lttng-tools.mk | 2 +- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 package/lttng-tools/0002-Fix-eventfd.cpp-Remove-the-scope-resolution-operator.patch diff --git a/package/lttng-tools/0002-Fix-eventfd.cpp-Remove-the-scope-resolution-operator.patch b/package/lttng-tools/0002-Fix-eventfd.cpp-Remove-the-scope-resolution-operator.patch new file mode 100644 index 0000000000..d4b46d3a5a --- /dev/null +++ b/package/lttng-tools/0002-Fix-eventfd.cpp-Remove-the-scope-resolution-operator.patch @@ -0,0 +1,48 @@ +From d94d2b90c5148c4d83f1424b6e984044f2d8191f Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 24 Jul 2025 14:35:51 +0800 +Subject: [PATCH] Fix: eventfd.cpp: Remove the scope resolution operator +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +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; + | | ^~~~~~~~~~~~~ + +Signed-off-by: Mingli Yu +Signed-off-by: Jérémie Galarneau +Change-Id: I405f6f15a25f7e6b7f0676093091a9e8a384739d + +Upstream: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff;h=d94d2b90c5148c4d83f1424b6e984044f2d8191f + +Signed-off-by: Bernd Kuhls +--- + 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 d331bbe40..447520f25 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.47.3 + diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index b48904d0b9..a181cd6dc0 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.13.8.tar.bz2.sha256 -sha256 b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1 lttng-tools-2.13.8.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.14.0.tar.bz2.sha256 +sha256 d8c39c26cec13b7bd82551cd52a22efc358b888e36ebcf9c1b60ef1c3a3c2fd3 lttng-tools-2.14.0.tar.bz2 # Locally computed sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index add1f12a8c..9a66ede669 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.13.8 +LTTNG_TOOLS_VERSION = 2.14.0 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES