[gentoo-commits] repo/proj/guru:master commit in: profiles/desc/, sys-cluster/extrae/

[gentoo-commits] repo/proj/guru:master commit in: profiles/desc/, sys-cluster/extrae/

[Andrew Ammerlaan]

commit:     bf29e9e3c553b337bff444abf9a85d6ad063363c
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu May 26 23:42:54 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri May 27 11:28:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf29e9e3

sys-cluster/extrae: move INSTRUMENT use expand to profiles/desc

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 profiles/desc/instrument.desc              |  8 ++++++++
 sys-cluster/extrae/extrae-3.8.3-r10.ebuild | 14 +++++++-------
 sys-cluster/extrae/metadata.xml            |  3 ---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/profiles/desc/instrument.desc b/profiles/desc/instrument.desc
new file mode 100644
index 000000000..8311329db
--- /dev/null
+++ b/profiles/desc/instrument.desc
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file contains descriptions of INSTRUMENT USE_EXPAND flags.
+
+dynamic-memory - Enables instrumentation for dynamic memory (malloc, free, realloc) calls
+io - Enables instrumentation for basic I/O (read, write) calls
+syscall - Enables instrumentation for system calls (other than I/O and mallocs)

diff --git a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
index de4da9133..20f867fe8 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE_INSTRUMENT="
-	+instrument-dynamic-memory
-	+instrument-io
-	+instrument-syscall
+	+instrument_dynamic-memory
+	+instrument_io
+	+instrument_syscall
 "
 IUSE="${IUSE_INSTRUMENT} clustering dlsym doc dyninst heterogeneous inotify memkind
 merge-in-trace nanos online opencl openmp openshmem +parallel-merge pebs-sampling
@@ -122,9 +122,9 @@ src_configure() {
 		$(use_enable doc)
 		$(use_enable heterogeneous)
 		$(use_enable inotify)
-		$(use_enable instrument-dynamic-memory)
-		$(use_enable instrument-io)
-		$(use_enable instrument-syscall)
+		$(use_enable instrument_dynamic-memory)
+		$(use_enable instrument_io)
+		$(use_enable instrument_syscall)
 		$(use_enable merge-in-trace)
 		$(use_enable nanos)
 		$(use_enable online)

diff --git a/sys-cluster/extrae/metadata.xml b/sys-cluster/extrae/metadata.xml
index 9e8da6d6f..88f029630 100644
--- a/sys-cluster/extrae/metadata.xml
+++ b/sys-cluster/extrae/metadata.xml
@@ -25,9 +25,6 @@ process). Extrae generates trace files that can be later visualized with sys-clu
 		<flag name="dyninst">Build with <pkg>sys-cluster/dyninst</pkg></flag>
 		<flag name="heterogeneous">Enable support for heterogeneous tracing</flag>
 		<flag name="inotify">Enable inotify support</flag>
-		<flag name="instrument-dynamic-memory">Enables instrumentation for dynamic memory (malloc, free, realloc) calls</flag>
-		<flag name="instrument-io">Enables instrumentation for basic I/O (read, write) calls</flag>
-		<flag name="instrument-syscall">Enables instrumentation for system calls (other than I/O and mallocs)</flag>
 		<flag name="java">Enable support for tracing Java. This is necessary to create the connectors between |TRACE| and Java applications.</flag>
 		<flag name="memkind">Enable <pkg>dev-libs/memkind</pkg> support</flag>
 		<flag name="merge-in-trace">Embed the merging process in the tracing library so the final tracefile can be generated automatically from the application run</flag>