[packages/lttng-tools] - updated to 2.13.15, fixes to build with -DNDEBUG

[qboosh]

commit e3047075987d61844b0f2201fda307369b662c35
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 16 19:10:20 2025 +0200

    - updated to 2.13.15, fixes to build with -DNDEBUG

 lttng-tools-assert.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 lttng-tools.spec         | 18 ++++++++++-------
 2 files changed, 63 insertions(+), 7 deletions(-)
---
diff --git a/lttng-tools.spec b/lttng-tools.spec
index ab1b08c..8fd8964 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -1,15 +1,16 @@
 Summary:	LTTng Trace Control
 Summary(pl.UTF-8):	Sterowanie śledzeniem LTTng
 Name:		lttng-tools
-Version:	2.13.14
-Release:	3
+Version:	2.13.15
+Release:	1
 License:	LGPL v2.1+ (library), GPL v2 (tools)
 Group:		Libraries
 Source0:	https://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
-# Source0-md5:	ee200a219f46c501805d1541efb26717
+# Source0-md5:	77b85bdbaa0ae6ba10cbd9df0f066400
 Patch0:		%{name}-python.patch
 Patch1:		x32.patch
 Patch2:		%{name}-swig-crash.patch
+Patch3:		%{name}-assert.patch
 URL:		https://lttng.org/
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.64
@@ -28,13 +29,13 @@ BuildRequires:	popt-devel >= 1.13
 BuildRequires:	python3-devel >= 1:3.2
 BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	swig-python >= 2.0.0
-BuildRequires:	userspace-rcu-devel >= 0.13
+BuildRequires:	userspace-rcu-devel >= 0.15
 BuildRequires:	xmlto
 #BuildRequires:	jdk java-lttng-ust # used for tests only
 Requires:	libxml2 >= 1:2.7.6
 Requires:	lttng-ust >= 2.12
 Requires:	popt >= 1.13
-Requires:	userspace-rcu >= 0.13
+Requires:	userspace-rcu >= 0.15
 Requires:	uname(release) >= 2.6.27
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,7 +57,7 @@ Requires:	kmod-devel
 Requires:	libuuid-devel
 Requires:	libxml2-devel >= 1:2.7.6
 Requires:	popt-devel >= 1.13
-Requires:	userspace-rcu-devel >= 0.13
+Requires:	userspace-rcu-devel >= 0.15
 
 %description devel
 Header files for LTTng control library.
@@ -94,15 +95,18 @@ Wiązanie Pythona 3 do LTTng.
 %patch -P 0 -p1
 %patch -P 1 -p1
 %patch -P 2 -p1
+%patch -P 3 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal} -I config
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 # NOTE: DON'T replace /usr/lib* with %{_libdir} in configure options!
 %configure \
+	PYTHON=%{__python3} \
+	PYTHON_CONFIG=/usr/bin/python3-config \
 	am_cv_python_pyexecdir=%{py3_sitedir} \
 	am_cv_python_pythondir=%{py3_sitescriptdir} \
 	--disable-silent-rules \
diff --git a/lttng-tools-assert.patch b/lttng-tools-assert.patch
new file mode 100644
index 0000000..eb64f9f
--- /dev/null
+++ b/lttng-tools-assert.patch
@@ -0,0 +1,52 @@
+Fix build with -DNDEBUG
+--- lttng-tools-2.13.15/src/common/fd-handle.c.orig	2025-04-11 21:14:01.552814819 +0200
++++ lttng-tools-2.13.15/src/common/fd-handle.c	2025-04-16 18:12:58.062643451 +0200
+@@ -21,7 +21,7 @@ static void fd_handle_release(struct urc
+ 	int ret;
+ 	struct fd_handle *handle = container_of(ref, struct fd_handle, ref);
+ 
+-	assert(handle->fd >= 0);
++	urcu_posix_assert(handle->fd >= 0);
+ 	ret = close(handle->fd);
+ 	if (ret == -1) {
+ 		PERROR("Failed to close file descriptor of fd_handle upon release: fd = %d",
+@@ -78,7 +78,7 @@ void fd_handle_put(struct fd_handle *han
+ LTTNG_HIDDEN
+ int fd_handle_get_fd(struct fd_handle *handle)
+ {
+-	assert(handle);
++	urcu_posix_assert(handle);
+ 	return handle->fd;
+ }
+ 
+--- lttng-tools-2.13.15/src/common/shm.c.orig	2025-04-11 21:14:01.560814846 +0200
++++ lttng-tools-2.13.15/src/common/shm.c	2025-04-16 18:14:47.862765417 +0200
+@@ -32,7 +32,7 @@ static int get_wait_shm(char *shm_path,
+ 	int wait_shm_fd, ret;
+ 	mode_t mode, old_mode;
+ 
+-	assert(shm_path);
++	urcu_posix_assert(shm_path);
+ 
+ 	/* Default permissions */
+ 	mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
+@@ -166,7 +166,7 @@ char *shm_ust_get_mmap(char *shm_path, i
+ 	char *wait_shm_mmap;
+ 	long sys_page_size;
+ 
+-	assert(shm_path);
++	urcu_posix_assert(shm_path);
+ 
+ 	sys_page_size = sysconf(_SC_PAGE_SIZE);
+ 	if (sys_page_size < 0) {
+--- lttng-tools-2.13.15/src/bin/lttng-sessiond/thread.c.orig	2025-04-11 21:14:01.528814737 +0200
++++ lttng-tools-2.13.15/src/bin/lttng-sessiond/thread.c	2025-04-16 18:18:24.694234677 +0200
+@@ -134,7 +134,7 @@ void lttng_thread_put(struct lttng_threa
+ 	if (!thread) {
+ 		return;
+ 	}
+-	assert(thread->ref.refcount);
++	urcu_posix_assert(thread->ref.refcount);
+ 	urcu_ref_put(&thread->ref, lttng_thread_release);
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lttng-tools.git/commitdiff/e3047075987d61844b0f2201fda307369b662c35