[gentoo-commits] repo/gentoo:master commit in: dev-util/lttng-tools/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/lttng-tools/files/

[Florian Schmaus]

commit:     4d1ee39e775f1a8081b67837dbe39690d5e3ebc7
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jan  7 19:15:54 2025 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 08:26:13 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d1ee39e

dev-util/lttng-tools: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../files/lttng-tools-2.13.9-slibtool.patch        | 87 ----------------------
 1 file changed, 87 deletions(-)

diff --git a/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch b/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch
deleted file mode 100644
index 634bd388b44c..000000000000
--- a/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://github.com/lttng/lttng-tools/pull/169
-https://github.com/lttng/lttng-tools/commit/bb1c9fc3f89c2faffb0228c0b77e32653e018a23
-
-From bb1c9fc3f89c2faffb0228c0b77e32653e018a23 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 8 Mar 2024 08:17:37 -0800
-Subject: [PATCH] Fix: baddr-statedump: use $(LIBTOOL) --mode=execute
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GNU libtool inconsistently places the compiled executable in the source
-directory or in the .libs directory where a libtool wrapper script is
-placed in the source directory.
-
-While slibtool will always place the compiled executable in the .libs
-directory and a wrapper script in the source directory.
-
-This will result with a build error when using slibtool since objcopy
-needs the executable and not the shell wrapper script, but this can be
-solved for both implementations by using $(LIBTOOL) --mode=execute on all
-commands that operate on the libtool compiled executables.
-
-Gentoo issue: https://bugs.gentoo.org/858095
-
-The GNU libtool --mode=excute is documented upstream.
-
-https://www.gnu.org/software/libtool/manual/html_node/Execute-mode.html
-https://www.gnu.org/software/libtool/manual/html_node/Debugging-executables.html
-
-And the GNU libtool behavior of when to create a wrapper script is
-documented in the 'Linking Executables' section.
-
-  "Notice that the executable, hell, was actually created in the .libs
-  subdirectory. Then, a wrapper script (or, on certain platforms, a
-  wrapper executable see Wrapper executables) was created in the current
-  directory.
-
-  Since libtool created a wrapper script, you should use libtool to
-  install it and debug it too. However, since the program does not depend
-  on any uninstalled libtool library, it is probably usable even without
-  the wrapper script."
-
-https://www.gnu.org/software/libtool/manual/html_node/Linking-executables.html
-
-And the inconsistency between GNU libtool and slibtool is documented at
-the Gentoo wiki.
-
-  "One difference between GNU libtool and slibtool is that the former will
-  conditionally place the compiled executable or a shell wrapper script in
-  the build directory, depending on whether or not the executable depends
-  on a build-local libtool library (e.g. libfoo.la). Where slibtool will
-  always place a compatible wrapper script in the build directory where
-  GNU libtool would have conditionally placed the executable. When the
-  wrapper script is created both GNU libtool and slibtool will place the
-  executable in the .libs directory within the build directory.
-  Consequently build systems, ebuilds, and other users should take care to
-  avoid scenarios like installing the wrapper script to the system instead
-  of the executable. In these cases ideally the executable would be
-  installed by the same libtool implementation that compiled it."
-
-https: //wiki.gentoo.org/wiki/Slibtool#Installing_or_using_binaries_created_by_libtool_manually
-Signed-off-by: orbea <orbea@riseup.net>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-Change-Id: I03102ed78af835daa9b9a5836c2979a5f5d4bd8c
----
- tests/regression/ust/baddr-statedump/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/regression/ust/baddr-statedump/Makefile.am b/tests/regression/ust/baddr-statedump/Makefile.am
-index f8fe26395..d37dbb6dd 100644
---- a/tests/regression/ust/baddr-statedump/Makefile.am
-+++ b/tests/regression/ust/baddr-statedump/Makefile.am
-@@ -19,11 +19,11 @@ EXTRA_DIST = test_baddr-statedump test_baddr-statedump.py
- 
- # Extract debug symbols
- prog.debug: prog
--	$(objcopy_verbose)$(OBJCOPY) --only-keep-debug prog prog.debug
-+	$(objcopy_verbose)$(LIBTOOL) --mode=execute $(OBJCOPY) --only-keep-debug prog prog.debug
- 
- # Strip and add debuglink
- prog.strip: prog.debug
--	@cp -f prog prog.strip
-+	@$(LIBTOOL) --mode=execute cp -f prog prog.strip
- 	$(objcopy_verbose)$(OBJCOPY) --strip-debug --add-gnu-debuglink=prog.debug prog.strip
- 
- all-local: prog.strip

[gentoo-commits] repo/gentoo:master commit in: dev-util/lttng-tools/files/

[Sam James]

commit:     0ebb2c79d159b7ba73dea456db9d2f9dc2ec928d
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Oct 13 20:09:39 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 14 07:29:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebb2c79

dev-util/lttng-tools: adjust patch to be backwards compatible with libxml2-2.13

Closes: https://bugs.gentoo.org/964303
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44168
Closes: https://github.com/gentoo/gentoo/pull/44168
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch b/dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch
index 76b663965c31..8eaf844e9ddc 100644
--- a/dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch
+++ b/dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch
@@ -1,6 +1,9 @@
 https://bugs.gentoo.org/955783
 https://github.com/lttng/lttng-tools/pull/170
 
+Modified to be backwards compatible with libxml2-2.13
+https://bugs.gentoo.org/964303
+
 From 7d669a90212e105b0f669aa2ab38c987b187baab Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Wed, 21 May 2025 13:09:25 +0800
@@ -36,12 +39,15 @@ Signed-off-by: Marko, Peter <Peter.Marko@siemens.com>
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 --- a/src/common/config/session-config.c
 +++ b/src/common/config/session-config.c
-@@ -429,7 +429,7 @@ static xmlChar *encode_string(const char *in_str)
+@@ -429,7 +429,11 @@ static xmlChar *encode_string(const char *in_str)
  		goto end;
  	}
  
--	ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len);
++#if LIBXML_VERSION >= 21400
 +	ret = handler->input.func(NULL, out_str, &out_len, (const xmlChar *) in_str, &in_len, 0);
++#else
+ 	ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len);
++#endif
  	if (ret < 0) {
  		xmlFree(out_str);
  		out_str = NULL;