From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3CE721581FB for ; Fri, 30 Aug 2024 18:10:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5109DE29BA; Fri, 30 Aug 2024 18:10:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30BC0E29BA for ; Fri, 30 Aug 2024 18:10:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2ADBB340C40 for ; Fri, 30 Aug 2024 18:10:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B28114D5 for ; Fri, 30 Aug 2024 18:10:09 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1725041391.efb3a82e3496d3a52a1d04d4cbdb83b25655d96a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-debug/systemtap/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-debug/systemtap/metadata.xml dev-debug/systemtap/systemtap-5.1-r1.ebuild dev-debug/systemtap/systemtap-9999.ebuild X-VCS-Directories: dev-debug/systemtap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: efb3a82e3496d3a52a1d04d4cbdb83b25655d96a X-VCS-Branch: master Date: Fri, 30 Aug 2024 18:10:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 157bbf33-04a1-4ae0-a0bc-f25bba500312 X-Archives-Hash: 8dab02c4d5d0a02f47f32bad62e268ff commit: efb3a82e3496d3a52a1d04d4cbdb83b25655d96a Author: Sam James gentoo org> AuthorDate: Fri Aug 30 18:04:29 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Aug 30 18:09:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efb3a82e dev-debug/systemtap: conditionally install /usr/bin/dtrace systemtap provides a 'dtrace' script at /usr/bin/dtrace which obviously clashes with dev-debug/dtrace. The reasons for this are complicated, but this 'dtrace' is only used by some packages for userspace probes. The plan, for now, is: * to modify packages to look for stap-dtrace instead; * users can set USE=dtrace-symlink to get systemtap to install /usr/bin/dtrace again to build applications locally or as a workaround for unported applications/scripts; * contact systemtap upstream about renaming it and providing a symlink conditionally as we are, and providing a pkgconfig var for getting the name Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James gentoo.org> dev-debug/systemtap/metadata.xml | 4 ++++ .../{systemtap-9999.ebuild => systemtap-5.1-r1.ebuild} | 12 +++++++++--- dev-debug/systemtap/systemtap-9999.ebuild | 9 ++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dev-debug/systemtap/metadata.xml b/dev-debug/systemtap/metadata.xml index ef6a9e2cd046..eb938ea4fd71 100644 --- a/dev-debug/systemtap/metadata.xml +++ b/dev-debug/systemtap/metadata.xml @@ -6,6 +6,10 @@ Enable debuginfod support via dev-libs/elfutils libdebuginfod + + Provide /usr/bin/dtrace symlink pointing to /usr/bin/stap-dtrace. + This prevents coinstallation with dev-debug/dtrace. + Support probing of libvirt domains. diff --git a/dev-debug/systemtap/systemtap-9999.ebuild b/dev-debug/systemtap/systemtap-5.1-r1.ebuild similarity index 93% copy from dev-debug/systemtap/systemtap-9999.ebuild copy to dev-debug/systemtap/systemtap-5.1-r1.ebuild index 94c53a3d0f1f..06b3b67bd81b 100644 --- a/dev-debug/systemtap/systemtap-9999.ebuild +++ b/dev-debug/systemtap/systemtap-5.1-r1.ebuild @@ -19,7 +19,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="debuginfod libvirt selinux sqlite +ssl test zeroconf" +IUSE="debuginfod dtrace-symlink libvirt selinux sqlite +ssl test zeroconf" CDEPEND=" ${PYTHON_DEPS} @@ -129,8 +129,7 @@ src_configure() { $(use_with selinux) ) - # Use bash because of bashisms with brace expansion in Makefile.am - # https://sourceware.org/PR32105 + # Use bash because of bashisms with brace expansion in Makefile.am (bug #913947) CONFIG_SHELL="${BROOT}"/bin/bash PYTHON3="${PYTHON}" econf "${myeconfargs[@]}" } @@ -151,4 +150,11 @@ src_test() { src_install() { default python_optimize + + # Avoid file collision with dev-debug/dtrace + mv "${ED}"/usr/bin/dtrace "${ED}"/usr/bin/stap-dtrace || die + + if use dtrace-symlink ; then + dosym stap-dtrace /usr/bin/dtrace + fi } diff --git a/dev-debug/systemtap/systemtap-9999.ebuild b/dev-debug/systemtap/systemtap-9999.ebuild index 94c53a3d0f1f..f26acd209aca 100644 --- a/dev-debug/systemtap/systemtap-9999.ebuild +++ b/dev-debug/systemtap/systemtap-9999.ebuild @@ -19,7 +19,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="debuginfod libvirt selinux sqlite +ssl test zeroconf" +IUSE="debuginfod dtrace-symlink libvirt selinux sqlite +ssl test zeroconf" CDEPEND=" ${PYTHON_DEPS} @@ -151,4 +151,11 @@ src_test() { src_install() { default python_optimize + + # Avoid file collision with dev-debug/dtrace + mv "${ED}"/usr/bin/dtrace "${ED}"/usr/bin/stap-dtrace || die + + if use dtrace-symlink ; then + dosym stap-dtrace /usr/bin/dtrace + fi }