| 1 |
commit: 87b2c352eb08e4fb6274834a2d2d1ad7c07e9c1a |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jun 5 13:24:47 2022 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Jun 5 20:57:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87b2c352 |
| 7 |
|
| 8 |
sys-cluster/extrae: fix pfm linking |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/849617 |
| 11 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 12 |
|
| 13 |
sys-cluster/extrae/extrae-4.0.1.ebuild | 6 ++++-- |
| 14 |
sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch | 12 ++++++++++++ |
| 15 |
2 files changed, 16 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-cluster/extrae/extrae-4.0.1.ebuild b/sys-cluster/extrae/extrae-4.0.1.ebuild |
| 18 |
index 8bcd5ef13..4e08d5e85 100644 |
| 19 |
--- a/sys-cluster/extrae/extrae-4.0.1.ebuild |
| 20 |
+++ b/sys-cluster/extrae/extrae-4.0.1.ebuild |
| 21 |
@@ -31,11 +31,12 @@ peruse +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml |
| 22 |
# aspectj? ( >=dev-java/aspectj-1.9.6 ) |
| 23 |
CDEPEND=" |
| 24 |
${PYTHON_DEPS} |
| 25 |
+ dev-libs/libpfm:= |
| 26 |
dev-libs/libxml2 |
| 27 |
dev-libs/papi |
| 28 |
!sys-cluster/openmpi[libompitrace(+)] |
| 29 |
- sys-libs/binutils-libs |
| 30 |
- sys-libs/libunwind |
| 31 |
+ sys-libs/binutils-libs:= |
| 32 |
+ sys-libs/libunwind:= |
| 33 |
sys-libs/zlib |
| 34 |
virtual/mpi |
| 35 |
|
| 36 |
@@ -80,6 +81,7 @@ BDEPEND=" |
| 37 |
|
| 38 |
PATCHES=( |
| 39 |
"${FILESDIR}/${PN}-3.8.3-link-sionlib.patch" |
| 40 |
+ "${FILESDIR}/${P}-fix-pfm-linking.patch" |
| 41 |
) |
| 42 |
REQUIRED_USE=" |
| 43 |
${PYTHON_REQUIRED_USE} |
| 44 |
|
| 45 |
diff --git a/sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch b/sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch |
| 46 |
new file mode 100644 |
| 47 |
index 000000000..f2a3673e7 |
| 48 |
--- /dev/null |
| 49 |
+++ b/sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch |
| 50 |
@@ -0,0 +1,12 @@ |
| 51 |
+diff -ru /var/tmp/portage/sys-cluster/extrae-4.0.1/work/extrae-4.0.1/src/cmd-line/Makefile.am extrae-4.0.1/src/cmd-line/Makefile.am |
| 52 |
+--- /var/tmp/portage/sys-cluster/extrae-4.0.1/work/extrae-4.0.1/src/cmd-line/Makefile.am 2022-05-13 17:41:45.000000000 +0200 |
| 53 |
++++ extrae-4.0.1/src/cmd-line/Makefile.am 2022-06-05 08:45:43.807262310 +0200 |
| 54 |
+@@ -11,7 +11,7 @@ |
| 55 |
+ extrae_cmd_CFLAGS = -I$(INCLUDE_DIR) -I$(COMMON_INC) -I$(TRACER_INC) \ |
| 56 |
+ -I$(TRACER_INC)/wrappers/API -I$(TRACER_INC)/clocks -I$(TRACER_INC)/hwc -O -g |
| 57 |
+ |
| 58 |
+-extrae_cmd_LDADD = $(TRACER_LIB)/libseqtrace.la $(MERGER_LIB)/libmpi2prv.la -lm |
| 59 |
++extrae_cmd_LDADD = $(TRACER_LIB)/libseqtrace.la $(MERGER_LIB)/libmpi2prv.la -lm @PAPI_LIBS@ |
| 60 |
+ if HAVE_BINUTILS |
| 61 |
+ extrae_cmd_LDADD += $(BFD_LDFLAGS) $(BFD_RPATH) $(BFD_LIBS) $(LIBERTY_LDFLAGS) $(LIBERTY_RPATH) $(LIBERTY_LIBS) |
| 62 |
+ endif |
Archives