1 |
commit: fcdc7e3531a5bc948221b2a6dedecc50413619bd |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jul 13 15:35:58 2021 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Jul 13 15:35:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fcdc7e35 |
7 |
|
8 |
sys-cluster/mrnet: libi support |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
sys-cluster/mrnet/files/mrnet-no-libi.patch | 32 ++++++++++++++ |
13 |
sys-cluster/mrnet/metadata.xml | 4 +- |
14 |
...0-r2.ebuild => mrnet-5.0.1_p20180510-r3.ebuild} | 49 +++++++++++----------- |
15 |
3 files changed, 59 insertions(+), 26 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/mrnet/files/mrnet-no-libi.patch b/sys-cluster/mrnet/files/mrnet-no-libi.patch |
18 |
new file mode 100644 |
19 |
index 000000000..8864c520d |
20 |
--- /dev/null |
21 |
+++ b/sys-cluster/mrnet/files/mrnet-no-libi.patch |
22 |
@@ -0,0 +1,32 @@ |
23 |
+--- a/conf/Makefile.in |
24 |
++++ b/conf/Makefile.in |
25 |
+@@ -191,8 +191,8 @@ |
26 |
+ |
27 |
+ |
28 |
+ LIBI_TARGETS = |
29 |
+-LIBLIBI = $(LIBDIR)/liblibi.a |
30 |
+-LIBLIBI_SO = $(LIBDIR)/liblibi.so |
31 |
++LIBLIBI = |
32 |
++LIBLIBI_SO = |
33 |
+ ifeq ($(MRNET_STARTUP_METHOD),libi) |
34 |
+ LIBI_TARGETS = $(LIBLIBI) |
35 |
+ ifeq ($(BUILD_SHARED_LIBS), yes) |
36 |
+@@ -388,9 +388,6 @@ |
37 |
+ |
38 |
+ INSTALL_PREREQ = install-prep |
39 |
+ INSTALL_PREREQ += xplat-install xplat_lightweight-install |
40 |
+-ifeq ($(MRNET_STARTUP_METHOD),libi) |
41 |
+- INSTALL_PREREQ += libi-install |
42 |
+-endif |
43 |
+ INSTALL_PREREQ += install-local lightweight-install |
44 |
+ |
45 |
+ install: $(INSTALL_PREREQ) |
46 |
+@@ -511,7 +508,7 @@ |
47 |
+ |
48 |
+ $(LIBXPLAT_LIGHTWEIGHT_SO): xplat_lightweight-sharedobj |
49 |
+ |
50 |
+-$(LIBI_TARGETS): libi-all |
51 |
++$(LIBI_TARGETS): |
52 |
+ |
53 |
+ $(LIBLMON): |
54 |
+ |
55 |
|
56 |
diff --git a/sys-cluster/mrnet/metadata.xml b/sys-cluster/mrnet/metadata.xml |
57 |
index e2be8a693..069e7794f 100644 |
58 |
--- a/sys-cluster/mrnet/metadata.xml |
59 |
+++ b/sys-cluster/mrnet/metadata.xml |
60 |
@@ -45,9 +45,9 @@ multicast operations may be in progress simultaneously. |
61 |
* Open source licensing. |
62 |
</longdescription> |
63 |
<use> |
64 |
- <!--<flag name="libi">Use libi as tree instantiation method instead of ssh</flag>--> |
65 |
+ <flag name="libi">Use libi as tree instantiation method instead of ssh</flag> |
66 |
<flag name="threadsafe">Build threasafe version of lightweight MRNet and XPlat libraries</flag> |
67 |
- <!--<flag name="slurm">Use slurm as libi tree instantiation method instead of ssh</flag>--> |
68 |
+ <flag name="slurm">Use slurm as libi tree instantiation method instead of ssh</flag> |
69 |
</use> |
70 |
<upstream> |
71 |
<bugs-to>https://github.com/dyninst/mrnet/issues</bugs-to> |
72 |
|
73 |
diff --git a/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r2.ebuild b/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r3.ebuild |
74 |
similarity index 58% |
75 |
rename from sys-cluster/mrnet/mrnet-5.0.1_p20180510-r2.ebuild |
76 |
rename to sys-cluster/mrnet/mrnet-5.0.1_p20180510-r3.ebuild |
77 |
index 74c5db51f..2cbbb0a0b 100644 |
78 |
--- a/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r2.ebuild |
79 |
+++ b/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r3.ebuild |
80 |
@@ -1,10 +1,12 @@ |
81 |
# Copyright 2019-2021 Gentoo Authors |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
|
84 |
-EAPI=8 |
85 |
+EAPI=7 |
86 |
|
87 |
COMMIT="7375ba5bb0df87c68e58ad15e9e5e351ae020c08" |
88 |
|
89 |
+inherit flag-o-matic |
90 |
+ |
91 |
DESCRIPTION="A Multicast/Reduction Network" |
92 |
HOMEPAGE="http://www.paradyn.org/mrnet" |
93 |
SRC_URI="https://github.com/dyninst/mrnet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
94 |
@@ -13,15 +15,22 @@ S="${WORKDIR}/${PN}-${COMMIT}" |
95 |
LICENSE="LGPL-2.1+" |
96 |
SLOT="0" |
97 |
KEYWORDS="~amd64" |
98 |
-IUSE="threadsafe" #launchmon libi slurm |
99 |
+IUSE="libi slurm threadsafe" |
100 |
|
101 |
-RDEPEND="dev-libs/boost:=" |
102 |
+RDEPEND=" |
103 |
+ dev-libs/boost:= |
104 |
+ libi? ( |
105 |
+ sys-cluster/launchmon |
106 |
+ sys-cluster/libi |
107 |
+ ) |
108 |
+" |
109 |
DEPEND=" |
110 |
${RDEPEND} |
111 |
+ slurm? ( sys-cluster/slurm ) |
112 |
" |
113 |
-# slurm? ( sys-cluster/slurm ) |
114 |
|
115 |
-#REQUIRED_USE="slurm? ( libi )" |
116 |
+PATCHES=( "${FILESDIR}/${PN}-no-libi.patch" ) |
117 |
+REQUIRED_USE="slurm? ( libi )" |
118 |
|
119 |
src_prepare() { |
120 |
rm -r external || die |
121 |
@@ -29,6 +38,7 @@ src_prepare() { |
122 |
} |
123 |
|
124 |
src_configure() { |
125 |
+ use libi && append-cxxflags "-llibi" |
126 |
local myconf=( |
127 |
--enable-shared |
128 |
--enable-verbosebuild |
129 |
@@ -37,25 +47,16 @@ src_configure() { |
130 |
$(use_enable threadsafe ltwt-threadsafe) |
131 |
) |
132 |
|
133 |
-#expat seems to be used only on cray |
134 |
-# if use expat; then |
135 |
-# myconf+=( "--with-expat=${EPREFIX}/usr" ) |
136 |
-# else |
137 |
-# myconf+=( "--without-expat" ) |
138 |
-# fi |
139 |
-# if use launchmon; then |
140 |
-# myconf+=( "--with-launchmon=${EPREFIX}/usr" ) |
141 |
-# else |
142 |
-# myconf+=( "--without-launchmon" ) |
143 |
-# fi |
144 |
-# if use libi; then |
145 |
-# myconf+=( "--with-libi=${EPREFIX}/usr" ) |
146 |
-# myconf+=( "--with-startup=libi" ) |
147 |
-# use slurm && myconf+=( "--with-libi-startup=slurm" ) |
148 |
-# else |
149 |
-# myconf+=( "--without-libi" ) |
150 |
-# myconf+=( "--with-startup=ssh" ) |
151 |
-# fi |
152 |
+ if use libi; then |
153 |
+ myconf+=( "--with-launchmon=${EPREFIX}/usr" ) |
154 |
+ myconf+=( "--with-libi=${EPREFIX}/usr" ) |
155 |
+ myconf+=( "--with-startup=libi" ) |
156 |
+ use slurm && myconf+=( "--with-libi-startup=slurm" ) |
157 |
+ else |
158 |
+ myconf+=( "--without-launchmon" ) |
159 |
+ myconf+=( "--without-libi" ) |
160 |
+ myconf+=( "--with-startup=ssh" ) |
161 |
+ fi |
162 |
|
163 |
econf "${myconf[@]}" |
164 |
} |