From 93187446cebb8fcb50f746b9199e6ef685bc5b3e Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 11 Jun 2026 01:45:04 +0100 Subject: [PATCH] dev-debug/systemtap: add 5.5, update live Drop bash requirement from live as Makefile.am has been fixed there, but it didn't land in 5.5. Signed-off-by: Sam James --- dev-debug/systemtap/Manifest | 2 + dev-debug/systemtap/systemtap-5.5.ebuild | 173 ++++++++++++++++++++++ dev-debug/systemtap/systemtap-9999.ebuild | 6 +- 3 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 dev-debug/systemtap/systemtap-5.5.ebuild diff --git a/dev-debug/systemtap/Manifest b/dev-debug/systemtap/Manifest index a2051e8f85e74..fad558ec13c85 100644 --- a/dev-debug/systemtap/Manifest +++ b/dev-debug/systemtap/Manifest @@ -1,3 +1,5 @@ DIST systemtap-5.3.tar.gz 6604029 BLAKE2B 063a73f41bbcc3a23ea2d98ff5e3562a87aea0c78fc915f223d59a32dc763fabdf324fe820aa0e969728eeeb8cd0264fd7e3dcc7ac5d81d005aa9c81e19ea604 SHA512 b252cd00a7ddab53f19d30129834b205ce8e90ccc5422444c1d188b765c122da712f5ca73092c425aef7430888c75ebfebbe3bfd87d6df8761338a1135abda89 DIST systemtap-5.4.tar.gz 6615758 BLAKE2B b2c3add6afcdd824d8253ee5e83837983519ffff69ff76c75abdefa64ae93128dc030b4632fe585e3b099edd635f22b6325811e704655ce57b3d460ced583af7 SHA512 5869fe3735e44be65ba7895a46b4ea66fcdcc21ed2ab0673c62d822730553837f816d82fd78eeca4bfe6f17fdeaa12eb2f94c0b0b7ebb8c495c961f0b6935785 DIST systemtap-5.4.tar.gz.asc 228 BLAKE2B 7153476f92199eef753cd85343a4ef8fed449eacf1708c8429fa0e0511bbac959c41a5b50690837810d14b7938c87326b70e0ab6fd321af25d2b86f9c7cbd8a9 SHA512 63da7b5e8a71c942af05c0d1b18a6f99f79403c6e1f5424382067ba27c75da7bebe02df501b1c7bb602d6cb98857fe02d15fb72535a33885acbd332c8e1508ea +DIST systemtap-5.5.tar.gz 6565426 BLAKE2B 0b4029837746260fdd3c2899dcb8f15714bf7a47859ae296d3d110366204795e631f3f5c2121b4d09605ab12d1832c29b0fa60903d0dc63386578ca8d33f3d94 SHA512 c44691a353b3d23579ef5bbc81f9f61dfaa0d2f6a232257670315eb7aef1f87196cb12b84607f06e5a1a8c022f883cead4737cd7b590fab4b6cd998e838fab2d +DIST systemtap-5.5.tar.gz.asc 228 BLAKE2B 8f5ed12d42d88e8d70be4bd45d9b5b81517c902fd77665c8c2db2e3e60527e4884ec608d4159230bd00b6bf2b006e81aed2016fa629ad9ab434e82a07bf780c9 SHA512 a9eb5a2df74ba367bc8a9426cace2ce1d8a43db6791c12d85a79a08adf30143268ac64a73ce35bfc62dda569c8d793f75569e84deabda1881a36a424245dbdcf diff --git a/dev-debug/systemtap/systemtap-5.5.ebuild b/dev-debug/systemtap/systemtap-5.5.ebuild new file mode 100644 index 0000000000000..04acca5273a5a --- /dev/null +++ b/dev-debug/systemtap/systemtap-5.5.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{12..14} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/fche.asc +inherit autotools flag-o-matic linux-info python-single-r1 toolchain-funcs + +DESCRIPTION="Linux trace/probe tool" +HOMEPAGE="https://sourceware.org/systemtap/ https://sourceware.org/systemtap/wiki" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://sourceware.org/git/systemtap.git" + inherit git-r3 +else + inherit verify-sig + SRC_URI=" + https://sourceware.org/ftp/${PN}/releases/${P}.tar.gz + verify-sig? ( https://sourceware.org/ftp/${PN}/releases/${P}.tar.gz.asc ) + " + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-fche )" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="debuginfod dtrace-symlink libvirt selinux sqlite +ssl test zeroconf" + +CDEPEND=" + ${PYTHON_DEPS} + + dev-libs/boost:= + >=dev-libs/elfutils-0.142[debuginfod?] + dev-libs/json-c:= + sys-libs/ncurses:= + sys-libs/readline:= + + libvirt? ( >=app-emulation/libvirt-1.0.2 ) + selinux? ( sys-libs/libselinux ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( + dev-libs/nspr + dev-libs/nss + ) + zeroconf? ( net-dns/avahi ) +" +DEPEND=" + ${CDEPEND} + app-alternatives/cpio + app-text/xmlto + >=sys-devel/gettext-0.18.2 + + libvirt? ( dev-libs/libxml2:= ) +" +RDEPEND=" + ${CDEPEND} + acct-group/stapdev + acct-group/stapsys + acct-group/stapusr +" +# which: https://sourceware.org/PR32106 +BDEPEND+=" + $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') + test? ( + dev-util/dejagnu + || ( + net-analyzer/netcat + net-analyzer/openbsd-netcat + ) + sys-apps/which + ) +" + +CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS" +ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'." +ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'." +ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'." + +DOCS="AUTHORS HACKING NEWS README" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# bug #935333, bug #923597, and so on; needs work to get passing on Gentoo. +RESTRICT="!test? ( test ) test" +PATCHES=( + "${FILESDIR}/${PN}-3.1-ia64.patch" +) + +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + python_fix_shebang . + + sed -i \ + -e 's#$(INSTALL_DATA) $(srcdir)/stap-exporter.options "$(DESTDIR)$(sysconfdir)/sysconfig/stap-exporter"##g' \ + stap-exporter/Makefile.am || die "Failed to modify stap-exporter Makefile.am" + sed -i \ + -e '\#^EnvironmentFile=-/etc/sysconfig/stap-exporter#d' \ + -e 's#$PORT $KEEPALIVE $SCRIPTS $OPTIONS#--port 9900 --keepalive 300#g' \ + stap-exporter/stap-exporter.service || die "Failed to adapt stap-exporter.service" + + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --cache-file="${S}"/config.cache + --disable-docs + --disable-grapher + --disable-refdocs + --disable-server + --disable-Werror + # Our toolchain sets this for us already and adding in + # -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation. + # This option (at least as of 4.5) doesn't pass -fno* etc, + # it just doesn't _add_ options, which is good. If it changes + # to actually pass -fno-stack-protector and friends, we'll + # need to change course. Forcing =2 also has problems for + # setting it to 3. + # bug #794667. + --disable-ssp + --enable-pie + --with-python3 + --without-java + --without-openssl + --without-python2-probes + --without-rpm + $(use_enable libvirt virt) + $(use_enable sqlite) + $(use_with debuginfod) + $(use_with zeroconf avahi) + $(use_with ssl nss) + $(use_with selinux) + ) + + # Use bash because of bashisms with brace expansion in Makefile.am + # https://sourceware.org/PR32105 + CONFIG_SHELL="${BROOT}"/bin/bash PYTHON3="${PYTHON}" econf "${myeconfargs[@]}" +} + +src_test() { + # TODO: Install tests like dev-debug/dtrace[test-install] and + # e.g. Fedora does. + ( + strip-flags + filter-flags '-fcf-protection=*' + filter-flags '-fdiagnostics-color=*' '-fdiagnostics-urls=*' + filter-flags '-g*' + filter-lto + tc-ld-force-bfd + emake -Onone -k check CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" + ) +} + +src_install() { + default + rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die + python_optimize + + # Avoid file collision with dev-debug/dtrace + mv "${ED}"/usr/bin/dtrace "${ED}"/usr/bin/stap-dtrace || die + mv "${ED}"/usr/share/man/man1/dtrace.1 "${ED}"/usr/share/man/man1/stap-dtrace.1 || die + + if use dtrace-symlink ; then + dosym stap-dtrace /usr/bin/dtrace + newman - dtrace.1 <<<".so stap-dtrace.1" + fi +} diff --git a/dev-debug/systemtap/systemtap-9999.ebuild b/dev-debug/systemtap/systemtap-9999.ebuild index 84c897c33d715..c43a868bfd012 100644 --- a/dev-debug/systemtap/systemtap-9999.ebuild +++ b/dev-debug/systemtap/systemtap-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{11..14} ) +PYTHON_COMPAT=( python3_{12..14} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/fche.asc inherit autotools flag-o-matic linux-info python-single-r1 toolchain-funcs @@ -138,9 +138,7 @@ src_configure() { $(use_with selinux) ) - # Use bash because of bashisms with brace expansion in Makefile.am - # https://sourceware.org/PR32105 - CONFIG_SHELL="${BROOT}"/bin/bash PYTHON3="${PYTHON}" econf "${myeconfargs[@]}" + PYTHON3="${PYTHON}" econf "${myeconfargs[@]}" } src_test() {