1 |
commit: 86fb06a2c84ac671e946502cd5c60410271573c9 |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Nov 7 21:36:53 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 7 21:43:11 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=86fb06a2 |
7 |
|
8 |
sys-cluster/extrae: link sionlib, fix rpath |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
sys-cluster/extrae/extrae-3.8.3-r10.ebuild | 7 +++++++ |
13 |
.../extrae/files/extrae-3.8.3-link-sionlib.patch | 23 ++++++++++++++++++++++ |
14 |
2 files changed, 30 insertions(+) |
15 |
|
16 |
diff --git a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild |
17 |
index 800ba5c57..de4da9133 100644 |
18 |
--- a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild |
19 |
+++ b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild |
20 |
@@ -78,8 +78,10 @@ BDEPEND=" |
21 |
dev-tex/latexmk |
22 |
dev-texlive/texlive-latexextra |
23 |
) |
24 |
+ java? ( app-admin/chrpath ) |
25 |
" |
26 |
|
27 |
+PATCHES=( "${FILESDIR}/${P}-link-sionlib.patch" ) |
28 |
REQUIRED_USE=" |
29 |
${PYTHON_REQUIRED_USE} |
30 |
|
31 |
@@ -226,6 +228,11 @@ src_install() { |
32 |
docompress -x "/usr/share/doc/${PF}/examples" |
33 |
docompress -x "/usr/share/doc/${PF}/tests" |
34 |
|
35 |
+ if use java; then |
36 |
+ chrpath -d "${ED}/usr/$(get_libdir)/libextrae-jvmti-agent.so" || die |
37 |
+ chrpath -d "${ED}/usr/$(get_libdir)/libjavatrace.so" || die |
38 |
+ fi |
39 |
+ |
40 |
find "${ED}" -name '*.a' -delete || die |
41 |
find "${ED}" -name '*.la' -delete || die |
42 |
} |
43 |
|
44 |
diff --git a/sys-cluster/extrae/files/extrae-3.8.3-link-sionlib.patch b/sys-cluster/extrae/files/extrae-3.8.3-link-sionlib.patch |
45 |
new file mode 100644 |
46 |
index 000000000..209da88d1 |
47 |
--- /dev/null |
48 |
+++ b/sys-cluster/extrae/files/extrae-3.8.3-link-sionlib.patch |
49 |
@@ -0,0 +1,23 @@ |
50 |
+--- a/src/tracer/Makefile.am |
51 |
++++ b/src/tracer/Makefile.am |
52 |
+@@ -631,6 +631,10 @@ |
53 |
+ NEW_MPI_LIBS = -L@MPI_LIBSDIR@ @MPI_LIBS@ -static |
54 |
+ endif |
55 |
+ |
56 |
++if HAVE_SIONLIB |
57 |
++SIONLIB_LINKER_FLAGS = @SIONLIB_LIBS@ |
58 |
++endif |
59 |
++ |
60 |
+ COMMON_LINKER_FLAGS = \ |
61 |
+ -release $(PACKAGE_VERSION) \ |
62 |
+ $(HWC_LINKER_FLAGS) \ |
63 |
+@@ -639,7 +643,8 @@ |
64 |
+ $(XML2_LINKER_FLAGS) \ |
65 |
+ $(LDL)\ |
66 |
+ $(LIBZ_LINKER_FLAGS) \ |
67 |
+- $(MRNET_LINKER_FLAGS) |
68 |
++ $(MRNET_LINKER_FLAGS) \ |
69 |
++ $(SIONLIB_LINKER_FLAGS) |
70 |
+ |
71 |
+ libcudaompitrace_la_LDFLAGS = $(COMMON_LINKER_FLAGS) |
72 |
+ libcudaompitracef_la_LDFLAGS = $(COMMON_LINKER_FLAGS) |