commit: 18fda4c85c988491f1e33fecf2b475fe02c12f6a
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Aug 31 14:02:10 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 14:10:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fda4c8
app-emulation/libvirt: only pass --native-file when we actually use it
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-emulation/libvirt/libvirt-10.0.0-r4.ebuild | 21 ++++++++++-----------
app-emulation/libvirt/libvirt-10.1.0-r3.ebuild | 21 ++++++++++-----------
app-emulation/libvirt/libvirt-10.2.0-r2.ebuild | 21 ++++++++++-----------
app-emulation/libvirt/libvirt-10.3.0-r3.ebuild | 21 ++++++++++-----------
app-emulation/libvirt/libvirt-10.5.0-r1.ebuild | 21 ++++++++++-----------
app-emulation/libvirt/libvirt-10.6.0.ebuild | 21 ++++++++++-----------
app-emulation/libvirt/libvirt-9.8.0-r4.ebuild | 21 ++++++++++-----------
app-emulation/libvirt/libvirt-9.9.0-r4.ebuild | 21 ++++++++++-----------
app-emulation/libvirt/libvirt-9999.ebuild | 21 ++++++++++-----------
9 files changed, 90 insertions(+), 99 deletions(-)
diff --git a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild
b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild
index 8175af048004..a3f65a6e0725 100644
--- a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild
+++ b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild
@@ -270,18 +270,7 @@ 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)
@@ -338,6 +327,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
diff --git a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild
b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild
index 7c3eaff4d212..925e76ae0bc6 100644
--- a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild
@@ -269,18 +269,7 @@ 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)
@@ -337,6 +326,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
diff --git a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild
b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild
index 5861595ed2a9..66eef4f76550 100644
--- a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild
@@ -268,18 +268,7 @@ 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)
@@ -336,6 +325,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
diff --git a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild
b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild
index c43e4e059e7a..4d08d7ffec5b 100644
--- a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild
@@ -269,18 +269,7 @@ 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)
@@ -337,6 +326,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
diff --git a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild
b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild
index b3f0f075fbd2..260b98ee3e16 100644
--- a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild
@@ -270,18 +270,7 @@ 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)
@@ -338,6 +327,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
diff --git a/app-emulation/libvirt/libvirt-10.6.0.ebuild
b/app-emulation/libvirt/libvirt-10.6.0.ebuild
index b3f0f075fbd2..260b98ee3e16 100644
--- a/app-emulation/libvirt/libvirt-10.6.0.ebuild
+++ b/app-emulation/libvirt/libvirt-10.6.0.ebuild
@@ -270,18 +270,7 @@ 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)
@@ -338,6 +327,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
diff --git a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild
b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild
index 635d0ec6d7c4..1898092ec1c8 100644
--- a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild
+++ b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild
@@ -260,18 +260,7 @@ 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)
@@ -328,6 +317,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
diff --git a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild
b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild
index d50de46a64ae..e9518a3313a8 100644
--- a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild
+++ b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild
@@ -261,18 +261,7 @@ 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)
@@ -329,6 +318,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild
b/app-emulation/libvirt/libvirt-9999.ebuild
index b3f0f075fbd2..260b98ee3e16 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -270,18 +270,7 @@ 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)
@@ -338,6 +327,16 @@ src_configure() {
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)
+ # Workaround for bug #938302
+ if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]"
; then
+ local native_file="${T}"/meson.${CHOST}.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ dtrace='stap-dtrace'
+ EOF
+ emesonargs+=( --native-file "${native_file}" )
+ fi
+
meson_src_configure
}
