commit: d698ee7790f5b51f9758635399cf987541a1f92e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Aug 30 19:10:30 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 30 19:11:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d698ee77
app-emulation/libvirt: handle dev-debug/systemtap[-dtrace-symlink] See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam <AT> 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(+) diff --git a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild index 69cebb86b3af..8175af048004 100644 --- a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild @@ -270,7 +270,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit) diff --git a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild index 79ac27610a78..7c3eaff4d212 100644 --- a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild @@ -269,7 +269,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit) diff --git a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild index a3d8c0af30fc..5861595ed2a9 100644 --- a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild @@ -268,7 +268,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit) diff --git a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild index f0f0337d8804..c43e4e059e7a 100644 --- a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild @@ -269,7 +269,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit) diff --git a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild index 315ce62b97a9..b3f0f075fbd2 100644 --- a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild @@ -270,7 +270,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit) diff --git a/app-emulation/libvirt/libvirt-10.6.0.ebuild b/app-emulation/libvirt/libvirt-10.6.0.ebuild index 315ce62b97a9..b3f0f075fbd2 100644 --- a/app-emulation/libvirt/libvirt-10.6.0.ebuild +++ b/app-emulation/libvirt/libvirt-10.6.0.ebuild @@ -270,7 +270,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit) diff --git a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild index 62d04583be8e..635d0ec6d7c4 100644 --- a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild @@ -260,7 +260,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit) diff --git a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild index 9ccc939d1bfc..d50de46a64ae 100644 --- a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild @@ -261,7 +261,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 315ce62b97a9..b3f0f075fbd2 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -270,7 +270,18 @@ src_prepare() { } src_configure() { + local native_file="${T}"/meson.${CHOST}.ini.local + + # Workaround for bug #938302 + if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature apparmor) $(meson_feature apparmor apparmor_profiles) $(meson_feature audit)
