commit:     88880423dfc8b9a0ef1ba3b10355eb715e84638a
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Wed Sep 10 20:41:37 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 22:47:05 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88880423

dev-util/lttng-tools: fix libxml2.14 in 2.12 branch

* Add verify-sig support.
* Handle kmod automagic.
* Unrestrict tests.

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

 dev-util/lttng-tools/Manifest                      |  1 +
 dev-util/lttng-tools/lttng-tools-2.12.17-r2.ebuild | 93 ++++++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index e77653aba169..e1e063ddb054 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,4 +1,5 @@
 DIST lttng-tools-2.12.17.tar.bz2 1627001 BLAKE2B 
db080e433320e1b9129a40e3e12bbf7c7071d80486953a6c2b2da3cdf8568d6ab8ed69fd61a477c56b940a3e144327ec4f813821f5e2bd2097a91c13a7276b35
 SHA512 
25480505e7f12b0a9abdfbbdc96cf12223a143bf13f436f2a1fbf616940323bcf088d51e0abcc72dad24cae237fca07620ff187ab437088e4ec808e6b47d4bb3
+DIST lttng-tools-2.12.17.tar.bz2.asc 833 BLAKE2B 
0f1a863f2b6870a5b5712c8390887b25a96e07dbccb079540f55abc30dea42a91c6c6cb890213735d066467fede04708e61e9290b9e3920f8c0d39df91131449
 SHA512 
2c0e68f53d08447ffadd081aaf059193014233363d8494dda7212cbe141e130c892904c59d053cd2598bede40cac0c7e3f0e07c38f26b6bd26257fa992f0fa75
 DIST lttng-tools-2.13.14.tar.bz2 1932238 BLAKE2B 
f079051502d01ffc67c4f8f0bbcdf3a4428546c652dcc352918c4908a37aeb510dd66309306cec835297c8d2f276e5cbd22ea4efef6866d3c0c0cf8651d68ef8
 SHA512 
61bdebb539cfb4eb61c9806e98742f39dc032d849b03d90cdb98d1891bd5bfbd0cb1f54bbc7bf79a11505ce7fee558497312d650bb41f11f739884e7cb8a750f
 DIST lttng-tools-2.13.15.tar.bz2 1934955 BLAKE2B 
3942ef4a48995329300ddf926a590b5eafbd75847f100e739b4a54be0ddeae41f7acfff0e24243fc41c876dc57be6a13157958ba1fa65111e272d4a7d50280ee
 SHA512 
0aaef9e298e5ec6f4c60d337277ca83aa86af17a1ebdeb976f000a68a8a99a1e4e0d1b88dae3c09171ca903d1ae1118819d4e3981fc4f9aade23b8370db2c367
 DIST lttng-tools-2.13.15.tar.bz2.asc 833 BLAKE2B 
a106d6330801c2da10e6f5428a1c83ec7380541770d8ab52f7f7c110c20b1681936d3341cf0119a686db5e85baf8a18ba017d8d62dd67f037324907798a82988
 SHA512 
30be205d14d55f6ec1db1ab1e356f04db69fa03fac6cfb862b1933334d184eb4aaf9bddb6e243baf6f5b1bd56d3a13a4deab8ae869cf5b47633958b0a227e923

diff --git a/dev-util/lttng-tools/lttng-tools-2.12.17-r2.ebuild 
b/dev-util/lttng-tools/lttng-tools-2.12.17-r2.ebuild
new file mode 100644
index 000000000000..b6062b587fa3
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.12.17-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic verify-sig
+
+# Please bump the following packages together:
+# dev-util/lttng-modules
+# dev-util/lttng-tools
+# dev-util/lttng-ust
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="https://lttng.org";
+SRC_URI="
+       https://lttng.org/files/${PN}/${MY_P}.tar.bz2
+       verify-sig? ( https://lttng.org/files/${PN}/${MY_P}.tar.bz2.asc )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="kmod test +ust"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       >=dev-libs/userspace-rcu-0.11.0:=
+       dev-libs/popt
+       >=dev-libs/libxml2-2.7.6:=
+       kmod? ( sys-apps/kmod )
+       ust? ( dev-util/lttng-ust:0/${MY_SLOT} )
+"
+DEPEND="
+       ${RDEPEND}
+       test? ( >=dev-libs/libpfm-4.0 )
+"
+BDEPEND="
+       virtual/pkgconfig
+       test? ( dev-util/babeltrace:0 )
+       verify-sig? ( sec-keys/openpgp-keys-jeremiegalarneau )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jeremiegalarneau.asc
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+       pthread_get_name_np # different from pthread_getname_*, not on linux
+       pthread_set_name_np # different from pthread_setname_*, not on linux
+)
+
+PATCHES=(
+       "${FILESDIR}"/lttng-tools-2.13.0-libxml2-2.14.patch
+)
+
+src_configure() {
+       # bug 906928
+       use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
+
+       local myeconfargs=(
+               $(use_with kmod)
+               $(use_with ust lttng-ust)
+               --disable-Werror
+               --disable-test-sdt-uprobe
+               --disable-test-python3-agent
+               --disable-python-bindings
+       )
+
+       econf "${myeconfargs[@]}"
+}
+
+src_test() {
+       # see tests/README.adoc
+       local -x LTTNG_ENABLE_DESTRUCTIVE_TESTS=0
+       local -x LTTNG_TOOLS_DISABLE_KERNEL_TESTS=1
+
+       # Otherwise it might try to use the system installed binary (and fail 
if its not installed prior!)
+       local -x 
LTTNG_SESSIOND_PATH="${S}/src/bin/lttng-sessiond/lttng-sessiond"
+
+       # Otherwise it might try to use /var/lib/portage/home
+       local -x LTTNG_HOME="${HOME}/lttng"
+       mkdir -p "${LTTNG_HOME}" || die
+
+       # Tests misbehave if you are unlucky
+       emake check -j1
+}
+
+src_install() {
+       default
+       find "${ED}" -type f -name '*.la' -delete || die
+}

Reply via email to