commit:     f69ea7ee29fd789d0c6146bbc8753c6d6f280112
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Apr 26 19:53:12 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon Apr 26 19:57:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f69ea7ee

sys-cluster/extrae: rebuild when sionlib changes

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/extrae/extrae-3.8.3-r2.ebuild                     |  2 +-
 .../extrae/{extrae-3.8.3-r2.ebuild => extrae-3.8.3-r3.ebuild} | 11 ++++++++---
 sys-cluster/extrae/metadata.xml                               |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/extrae/extrae-3.8.3-r2.ebuild 
b/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
index 8f87b2140..08350300d 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
@@ -44,7 +44,7 @@ CDEPEND="
        elf? ( virtual/libelf )
        inotify? ( dev-libs/libevent )
        opencl? ( dev-util/opencl-headers )
-       sionlib? ( sys-cluster/sionlib )
+       sionlib? ( sys-cluster/sionlib:= )
 "
 #      aspectj? ( >=dev-java/aspectj-1.9.6 )
 DEPEND="

diff --git a/sys-cluster/extrae/extrae-3.8.3-r2.ebuild 
b/sys-cluster/extrae/extrae-3.8.3-r3.ebuild
similarity index 90%
copy from sys-cluster/extrae/extrae-3.8.3-r2.ebuild
copy to sys-cluster/extrae/extrae-3.8.3-r3.ebuild
index 8f87b2140..0f9074028 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz ->
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory 
+instrument-io +instrument-syscall merge-in-trace nanos opencl openmp 
+parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib 
sionlib smpss +xml"
+IUSE="boost clustering doc dwarf elf fft heterogeneous inotify 
+instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace 
nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling 
+single-mpi-lib sionlib smpss +xml"
 #aspectj and aspectj-weaver need to both be enabled at the same time
 #current dev-java/aspectj package only provides aspectj.jar
 #aspectj needs foo/lib/aspectj.jar and foo/bin/ajc
@@ -40,11 +40,12 @@ CDEPEND="
        || ( sys-devel/binutils:* sys-libs/binutils-libs )
 
        boost? ( dev-libs/boost:= )
+       clustering? ( sys-cluster/clusteringsuite )
        dwarf? ( dev-libs/libdwarf )
        elf? ( virtual/libelf )
        inotify? ( dev-libs/libevent )
        opencl? ( dev-util/opencl-headers )
-       sionlib? ( sys-cluster/sionlib )
+       sionlib? ( sys-cluster/sionlib:= )
 "
 #      aspectj? ( >=dev-java/aspectj-1.9.6 )
 DEPEND="
@@ -99,7 +100,6 @@ src_configure() {
                --without-dyninst
                --without-cupti
                --without-memkind
-               --without-clustering
                --without-synapse
                --without-spectral
                --without-openshmem
@@ -138,6 +138,11 @@ src_configure() {
        else
                myconf+=( "--without-boost" )
        fi
+       if use clustering; then
+               myconf+=( "--with-clustering=${EPREFIX}/usr" )
+       else
+               myconf+=( "--without-clustering" )
+       fi
        if use dwarf; then
                myconf+=( "--with-dwarf=${EPREFIX}/usr" )
        else

diff --git a/sys-cluster/extrae/metadata.xml b/sys-cluster/extrae/metadata.xml
index 9a9b339ec..62a7dbbc5 100644
--- a/sys-cluster/extrae/metadata.xml
+++ b/sys-cluster/extrae/metadata.xml
@@ -18,9 +18,10 @@ process). Extrae generates trace files that can be later 
visualized with <pkg>sy
        <use>
                <!--<flag name="aspectj">Enable support for tracing Java 
through <pkg>dev-java/aspectj</pkg> (experimental)</flag>-->
                <flag name="boost">Search for boost</flag>
-               <flag name="doc">Generates the documentation of this 
instrumentation package</flag>
+               <flag name="clustering">Enable 
<pkg>sys-cluster/clusteringsuite</pkg> support</flag>
                <!--<flag name="cuda">Enable support for tracing CUDA calls on 
nVidia hardware and needs to point to the CUDA SDK installation path. This 
instrumentation is only valid in binaries that use the shared version of the 
CUDA library.</flag>-->
                <!--<flag name="cupti">CUPTI is used to instrument CUDA 
calls</flag>-->
+               <flag name="doc">Generates the documentation of this 
instrumentation package</flag>
                <flag name="dwarf">Build with 
<pkg>dev-libs/libdwarf</pkg></flag>
                <!--<flag name="dyninst">Build with dyninst</flag>-->
                <flag name="elf">Build with <pkg>virtual/libelf</pkg></flag>

Reply via email to