From 80ce0488664df5fb8050d222637f3907b97da61d Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Fri, 6 Aug 2021 02:13:32 +0200
Subject: [PATCH] sys-cluster/extrae: add openshmem useflag

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 ...trae-3.8.3-r8.ebuild => extrae-3.8.3-r9.ebuild} | 14 ++++++++++----
 sys-cluster/extrae/metadata.xml                    |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)
 rename sys-cluster/extrae/{extrae-3.8.3-r8.ebuild => extrae-3.8.3-r9.ebuild} (94%)

diff --git a/sys-cluster/extrae/extrae-3.8.3-r8.ebuild b/sys-cluster/extrae/extrae-3.8.3-r9.ebuild
similarity index 94%
rename from sys-cluster/extrae/extrae-3.8.3-r8.ebuild
rename to sys-cluster/extrae/extrae-3.8.3-r9.ebuild
index 5f1a1ef45a..c52ea919cd 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r8.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r9.ebuild
@@ -15,14 +15,15 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="clustering doc dyninst heterogeneous inotify +instrument-dynamic-memory +instrument-io
-+instrument-syscall memkind merge-in-trace nanos online opencl openmp +parallel-merge
-pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml"
++instrument-syscall memkind merge-in-trace nanos online opencl openmp openshmem
++parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss
+spectral +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
 #aspectj-weaver needs bar/aspectjweaver.jar
-#TODO: pmapi cuda cupti openshmem gm mx aspectj
+#TODO: pmapi cuda cupti gm mx aspectj
 #TODO: support llvm libunwind, llvm rt, elftoolchain
 
 CDEPEND="
@@ -48,6 +49,7 @@ CDEPEND="
 	memkind? ( dev-libs/memkind )
 	online? ( sys-cluster/synapse )
 	opencl? ( dev-util/opencl-headers )
+	openshmem? ( sys-cluster/SOS )
 	sionlib? ( sys-cluster/sionlib:= )
 	spectral? (
 		sci-libs/fftw
@@ -106,7 +108,6 @@ src_configure() {
 		--with-unwind="${EPREFIX}/usr"
 
 		--without-cupti
-		--without-openshmem
 		--without-gm
 		--without-mx
 
@@ -175,6 +176,11 @@ src_configure() {
 	else
 		myconf+=( "--without-opencl" )
 	fi
+	if use openshmem; then
+		myconf+=( "--with-openshmem=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-openshmem" )
+	fi
 	if use sionlib; then
 		myconf+=( "--with-sionlib=${EPREFIX}/usr" )
 		myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlib" )
diff --git a/sys-cluster/extrae/metadata.xml b/sys-cluster/extrae/metadata.xml
index fc023d8fb3..ba115eca51 100644
--- a/sys-cluster/extrae/metadata.xml
+++ b/sys-cluster/extrae/metadata.xml
@@ -34,6 +34,7 @@ process). Extrae generates trace files that can be later visualized with sys-clu
 		<flag name="online">Enable on-line analysis</flag>
 		<flag name="opencl">Enable support for tracing OpenCL</flag>
 		<flag name="openmp">Enable support for tracing OpenMP</flag>
+		<flag name="openshmem">OpenSHMEM to be used for the instrumentation package</flag>
 		<flag name="parallel-merge">Build the parallel mergers (mpimpi2prv/mpimpi2dim) based on MPI</flag>
 		<flag name="pebs-sampling">enable PEBS sampling</flag>
 		<!--<flag name="pmapi">Enable PMAPI library to gather CPU performance counters</flag>-->