For historical reasons, dev-debug/systemtap installs /usr/bin/dtrace. We now have dev-debug/dtrace in tree which installs /usr/sbin/dtrace. On merged-usr systems, they collide. dev-debug/dtrace currently has a blocker on dev-debug/systemtap unconditionally. This is a shame given that the kind of people to use one tool are likely to try the other. I'm going to try work with the two upstreams (dtrace, stap) to figure something out, but in the meantime, any objections to a USE=dtrace-symlink in systemtap? I propose: * USE=dtrace-symlink: systemtap installs /usr/bin/dtrace -> /usr/bin/systemtap-dtrace (or stap-dtrace, I don't mind which) * USE=-dtrace-symlink: systemtap installs /usr/bin/systemtap-dtrace (or stap-dtrace)
Alternatively, we add a USE flag to not install 'dtrace' at all in systemtap. This would let it make the Python runtime dep conditional. But if we are going to do that, let's please avoid USE=dtrace, as I'm trying to figure out a plan for USDT functionality.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efb3a82e3496d3a52a1d04d4cbdb83b25655d96a commit efb3a82e3496d3a52a1d04d4cbdb83b25655d96a Author: Sam James <sam@gentoo.org> AuthorDate: 2024-08-30 18:04:29 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-30 18:09:51 +0000 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 <sam@gentoo.org> dev-debug/systemtap/metadata.xml | 4 + dev-debug/systemtap/systemtap-5.1-r1.ebuild | 160 ++++++++++++++++++++++++++++ dev-debug/systemtap/systemtap-9999.ebuild | 9 +- 3 files changed, 172 insertions(+), 1 deletion(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=585dabcee6b0dde736b9ea3f4d02948ec7af12b2 commit 585dabcee6b0dde736b9ea3f4d02948ec7af12b2 Author: Sam James <sam@gentoo.org> AuthorDate: 2024-08-30 18:10:57 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-30 18:11:49 +0000 dev-debug/dtrace: update dev-debug/systemtap blocker We can now be coinstalled with dev-debug/systemtap if it has USE=-dtrace-symlink. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> dev-debug/dtrace/{dtrace-2.0.1.1-r1.ebuild => dtrace-2.0.1.1-r2.ebuild} | 2 +- dev-debug/dtrace/dtrace-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d698ee7790f5b51f9758635399cf987541a1f92e commit d698ee7790f5b51f9758635399cf987541a1f92e Author: Sam James <sam@gentoo.org> AuthorDate: 2024-08-30 19:10:30 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-30 19:11:25 +0000 app-emulation/libvirt: handle dev-debug/systemtap[-dtrace-symlink] See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> app-emulation/libvirt/libvirt-10.0.0-r4.ebuild | 11 +++++++++++ app-emulation/libvirt/libvirt-10.1.0-r3.ebuild | 11 +++++++++++ app-emulation/libvirt/libvirt-10.2.0-r2.ebuild | 11 +++++++++++ app-emulation/libvirt/libvirt-10.3.0-r3.ebuild | 11 +++++++++++ app-emulation/libvirt/libvirt-10.5.0-r1.ebuild | 11 +++++++++++ app-emulation/libvirt/libvirt-10.6.0.ebuild | 11 +++++++++++ app-emulation/libvirt/libvirt-9.8.0-r4.ebuild | 11 +++++++++++ app-emulation/libvirt/libvirt-9.9.0-r4.ebuild | 11 +++++++++++ app-emulation/libvirt/libvirt-9999.ebuild | 11 +++++++++++ 9 files changed, 99 insertions(+)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6128b3ae9c452bb77e08fc0924ed97c7ed0dafa commit e6128b3ae9c452bb77e08fc0924ed97c7ed0dafa Author: Sam James <sam@gentoo.org> AuthorDate: 2024-08-30 21:06:43 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-30 21:09:24 +0000 app-emulation/qemu: handle dev-debug/systemtap[-dtrace-symlink] See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> app-emulation/qemu/qemu-7.2.11.ebuild | 8 ++++++++ app-emulation/qemu/qemu-7.2.12.ebuild | 8 ++++++++ app-emulation/qemu/qemu-7.2.13.ebuild | 8 ++++++++ app-emulation/qemu/qemu-8.0.5.ebuild | 8 ++++++++ app-emulation/qemu/qemu-8.1.5.ebuild | 8 ++++++++ app-emulation/qemu/qemu-8.2.3.ebuild | 8 ++++++++ app-emulation/qemu/qemu-8.2.5.ebuild | 8 ++++++++ app-emulation/qemu/qemu-8.2.6.ebuild | 8 ++++++++ app-emulation/qemu/qemu-9.0.1.ebuild | 8 ++++++++ app-emulation/qemu/qemu-9.0.2.ebuild | 8 ++++++++ app-emulation/qemu/qemu-9999.ebuild | 8 ++++++++ 11 files changed, 88 insertions(+)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a95e3fe12ec7a8d668693c26ad6d79bd96810a commit 09a95e3fe12ec7a8d668693c26ad6d79bd96810a Author: Sam James <sam@gentoo.org> AuthorDate: 2024-08-31 02:00:39 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-31 02:00:39 +0000 sys-auth/sssd: handle dev-debug/systemtap[-dtrace-symlink] See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> sys-auth/sssd/sssd-2.9.4.ebuild | 5 +++++ sys-auth/sssd/sssd-2.9.5.ebuild | 5 +++++ 2 files changed, 10 insertions(+)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb58ff0c756c652ec372c0b1880a8373fc04797a commit bb58ff0c756c652ec372c0b1880a8373fc04797a Author: Sam James <sam@gentoo.org> AuthorDate: 2024-08-31 02:43:48 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-31 02:49:08 +0000 dev-lang/ruby: handle dev-debug/systemtap[-dtrace-symlink] See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> dev-lang/ruby/ruby-3.1.4-r3.ebuild | 5 +++++ dev-lang/ruby/ruby-3.1.5.ebuild | 5 +++++ dev-lang/ruby/ruby-3.1.6-r1.ebuild | 5 +++++ dev-lang/ruby/ruby-3.2.3.ebuild | 5 +++++ dev-lang/ruby/ruby-3.2.4-r1.ebuild | 5 +++++ dev-lang/ruby/ruby-3.2.4.ebuild | 5 +++++ dev-lang/ruby/ruby-3.2.5.ebuild | 5 +++++ dev-lang/ruby/ruby-3.3.2.ebuild | 5 +++++ dev-lang/ruby/ruby-3.3.4-r1.ebuild | 5 +++++ dev-lang/ruby/ruby-3.3.4.ebuild | 5 +++++ 10 files changed, 50 insertions(+) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad9bec27d191027a12175cb78aac69582208494 commit 3ad9bec27d191027a12175cb78aac69582208494 Author: Sam James <sam@gentoo.org> AuthorDate: 2024-08-31 02:39:51 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-31 02:49:07 +0000 dev-java/openjdk: handle dev-debug/systemtap[-dtrace-symlink] See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> dev-java/openjdk/openjdk-11.0.24_p8.ebuild | 5 +++++ dev-java/openjdk/openjdk-17.0.12_p7.ebuild | 5 +++++ dev-java/openjdk/openjdk-21.0.4_p7.ebuild | 5 +++++ 3 files changed, 15 insertions(+) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb1e5b03c92bf64617787852b03a5848fca844cb commit fb1e5b03c92bf64617787852b03a5848fca844cb Author: Sam James <sam@gentoo.org> AuthorDate: 2024-08-31 02:35:06 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-31 02:49:07 +0000 dev-libs/glib: handle dev-debug/systemtap[-dtrace-symlink] See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> dev-libs/glib/glib-2.76.4.ebuild | 10 ++++++++++ dev-libs/glib/glib-2.78.3.ebuild | 10 ++++++++++ dev-libs/glib/glib-2.78.4-r1.ebuild | 10 ++++++++++ dev-libs/glib/glib-2.78.6.ebuild | 10 ++++++++++ dev-libs/glib/glib-2.80.4.ebuild | 11 +++++++++++ 5 files changed, 51 insertions(+)
(In reply to Larry the Git Cow from comment #7) > https://gitweb.gentoo.org/repo/gentoo.git/commit/ > ?id=fb1e5b03c92bf64617787852b03a5848fca844cb > > commit fb1e5b03c92bf64617787852b03a5848fca844cb > Author: Sam James <sam@gentoo.org> > AuthorDate: 2024-08-31 02:35:06 +0000 > Commit: Sam James <sam@gentoo.org> > CommitDate: 2024-08-31 02:49:07 +0000 > > dev-libs/glib: handle dev-debug/systemtap[-dtrace-symlink] > > See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. > > Bug: https://bugs.gentoo.org/938302 > Signed-off-by: Sam James <sam@gentoo.org> > > dev-libs/glib/glib-2.76.4.ebuild | 10 ++++++++++ > dev-libs/glib/glib-2.78.3.ebuild | 10 ++++++++++ > dev-libs/glib/glib-2.78.4-r1.ebuild | 10 ++++++++++ > dev-libs/glib/glib-2.78.6.ebuild | 10 ++++++++++ > dev-libs/glib/glib-2.80.4.ebuild | 11 +++++++++++ > 5 files changed, 51 insertions(+) I think this broke USE=-systemtap. I'm getting this error now: Could not find any valid candidate for native files: /var/tmp/portage/dev-libs/glib-2.78.6/temp/meson.x86_64-pc-linux-gnu.ini.local ERROR: Cannot find specified native file: /var/tmp/portage/dev-libs/glib-2.78.6/temp/meson.x86_64-pc-linux-gnu.ini.local
(In reply to Alexander Tsoy from comment #8) Aye, see bug 938822. Sorry for the inconvenience. It was bad timing as I had no internet after.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148f5bc17a32dc8578f126864fcf7794bb04b8c6 commit 148f5bc17a32dc8578f126864fcf7794bb04b8c6 Author: Sam James <sam@gentoo.org> AuthorDate: 2024-09-11 00:12:41 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-09-11 00:12:41 +0000 dev-lang/ruby: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> dev-lang/ruby/ruby-3.1.4-r3.ebuild | 2 +- dev-lang/ruby/ruby-3.1.5.ebuild | 2 +- dev-lang/ruby/ruby-3.1.6-r1.ebuild | 2 +- dev-lang/ruby/ruby-3.2.3.ebuild | 2 +- dev-lang/ruby/ruby-3.2.4-r1.ebuild | 2 +- dev-lang/ruby/ruby-3.2.4.ebuild | 2 +- dev-lang/ruby/ruby-3.2.5.ebuild | 2 +- dev-lang/ruby/ruby-3.3.2.ebuild | 2 +- dev-lang/ruby/ruby-3.3.4-r1.ebuild | 2 +- dev-lang/ruby/ruby-3.3.4.ebuild | 2 +- dev-lang/ruby/ruby-3.3.5.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476889f92660dcad5f50a8670588cd3d7227a92b commit 476889f92660dcad5f50a8670588cd3d7227a92b Author: Sam James <sam@gentoo.org> AuthorDate: 2024-09-11 00:11:43 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-09-11 00:11:43 +0000 dev-java/openjdk: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> dev-java/openjdk/openjdk-11.0.24_p8.ebuild | 2 +- dev-java/openjdk/openjdk-17.0.12_p7.ebuild | 2 +- dev-java/openjdk/openjdk-21.0.4_p7.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a166651466d44511d03fa076be30a1f2e9c41d75 commit a166651466d44511d03fa076be30a1f2e9c41d75 Author: Sam James <sam@gentoo.org> AuthorDate: 2024-09-11 00:09:58 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-09-11 00:10:28 +0000 app-emulation/libvirt: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> app-emulation/libvirt/libvirt-10.0.0-r4.ebuild | 2 +- app-emulation/libvirt/libvirt-10.1.0-r3.ebuild | 2 +- app-emulation/libvirt/libvirt-10.2.0-r2.ebuild | 2 +- app-emulation/libvirt/libvirt-10.3.0-r3.ebuild | 2 +- app-emulation/libvirt/libvirt-10.5.0-r1.ebuild | 2 +- app-emulation/libvirt/libvirt-10.6.0.ebuild | 2 +- app-emulation/libvirt/libvirt-9.8.0-r4.ebuild | 2 +- app-emulation/libvirt/libvirt-9.9.0-r4.ebuild | 2 +- app-emulation/libvirt/libvirt-9999.ebuild | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8606d2863b3e21f9edcc130faf04a7a73bdb3d53 commit 8606d2863b3e21f9edcc130faf04a7a73bdb3d53 Author: Sam James <sam@gentoo.org> AuthorDate: 2024-09-11 00:08:24 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-09-11 00:08:24 +0000 sys-auth/sssd: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> sys-auth/sssd/sssd-2.9.4.ebuild | 2 +- sys-auth/sssd/sssd-2.9.5.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8169ebbc4e6894a4f5ca3bf9d666baa04014ce33 commit 8169ebbc4e6894a4f5ca3bf9d666baa04014ce33 Author: Sam James <sam@gentoo.org> AuthorDate: 2024-09-11 00:07:23 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-09-11 00:07:23 +0000 dev-libs/glib: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> dev-libs/glib/glib-2.76.4.ebuild | 2 +- dev-libs/glib/glib-2.78.3.ebuild | 2 +- dev-libs/glib/glib-2.78.4-r1.ebuild | 2 +- dev-libs/glib/glib-2.78.6.ebuild | 2 +- dev-libs/glib/glib-2.80.4.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943a450e07e1a1959b34354faad06541dd515c12 commit 943a450e07e1a1959b34354faad06541dd515c12 Author: Sam James <sam@gentoo.org> AuthorDate: 2024-09-11 00:05:38 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-09-11 00:05:38 +0000 app-emulation/qemu: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org> app-emulation/qemu/qemu-7.2.11.ebuild | 2 +- app-emulation/qemu/qemu-7.2.12.ebuild | 2 +- app-emulation/qemu/qemu-7.2.13.ebuild | 2 +- app-emulation/qemu/qemu-8.0.5.ebuild | 2 +- app-emulation/qemu/qemu-8.1.5.ebuild | 2 +- app-emulation/qemu/qemu-8.2.3.ebuild | 2 +- app-emulation/qemu/qemu-8.2.5-r1.ebuild | 2 +- app-emulation/qemu/qemu-8.2.6-r1.ebuild | 2 +- app-emulation/qemu/qemu-9.0.1-r1.ebuild | 2 +- app-emulation/qemu/qemu-9.0.2-r1.ebuild | 2 +- app-emulation/qemu/qemu-9999.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7909a793ea72d41af9fdad6e9f2db77c51bd63a commit f7909a793ea72d41af9fdad6e9f2db77c51bd63a Author: Z. Liu <zhixu.liu@gmail.com> AuthorDate: 2024-09-19 02:27:14 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-09-19 03:00:10 +0000 dev-java/openjdk: fix handle of systemtap without dtrace-symlink openjdk accept DTRACE from command line instead of env, see jdk source line 297 of make/autoconf/util_paths.m4, otherwise build will failed: configure: WARNING: Ignoring value of DTRACE from the environment. Use command line variables instead. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Z. Liu <zhixu.liu@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38678 Signed-off-by: Sam James <sam@gentoo.org> dev-java/openjdk/openjdk-11.0.24_p8.ebuild | 10 +++++----- dev-java/openjdk/openjdk-17.0.12_p7.ebuild | 10 +++++----- dev-java/openjdk/openjdk-21.0.4_p7.ebuild | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-)
