Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/otf2/files/, sys-cluster/otf2/
Date: Thu, 30 Jun 2022 17:39:46
Message-Id: 1656584776.892348f1c0bf6a4024ad25377c5e03ad2a2a873e.flow@gentoo
1 commit: 892348f1c0bf6a4024ad25377c5e03ad2a2a873e
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 29 21:55:05 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 10:26:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=892348f1
7
8 sys-cluster/otf2: add 3.0, use custom compiler
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 sys-cluster/otf2/Manifest | 1 +
13 .../otf2/files/otf2-2.3-respect-flags.patch | 264 ---------------------
14 .../otf2/files/otf2-3.0-respect-flags.patch | 95 ++++++++
15 .../{otf2-2.3-r2.ebuild => otf2-2.3-r3.ebuild} | 51 +++-
16 .../otf2/{otf2-2.3-r2.ebuild => otf2-3.0.ebuild} | 51 +++-
17 5 files changed, 172 insertions(+), 290 deletions(-)
18
19 diff --git a/sys-cluster/otf2/Manifest b/sys-cluster/otf2/Manifest
20 index 4ff1ad525..1bb17c409 100644
21 --- a/sys-cluster/otf2/Manifest
22 +++ b/sys-cluster/otf2/Manifest
23 @@ -1 +1,2 @@
24 DIST otf2-2.3.tar.gz 5321226 BLAKE2B a217ac2bcc0fa777dccc99a0f90a143b3cfea66ff717cfe66f68d2d59407023b1f0e419d9c4275d27f201fa3df0c5a89d4730052039144b02a2136e390e85fbb SHA512 c27c768f178e512c46683667d70bc2ad3871b17b8978356b13917d3fc12b49b4ee5d5767e9e10a247bbc7f2e911aaae7455bfec8f36704236d55c16454fa0a4c
25 +DIST otf2-3.0.tar.gz 5260678 BLAKE2B cb783c8466e2be424452284ac03df13306f1bad1163adcf113b4bcf93fe2be4e7fb05053ccf09d825db3e3f21b40667d4c03365be96ab240b4e1376ba6943703 SHA512 63cef15091d4071860211a5f52c375be089a3c8dc5ce28df0078197f2a2b7c45c2ecd9e677cb7ecf02339716bd0b2b692d1cb17c1ad1114978ffaa29cd28ff43
26
27 diff --git a/sys-cluster/otf2/files/otf2-2.3-respect-flags.patch b/sys-cluster/otf2/files/otf2-2.3-respect-flags.patch
28 index ff1db4dcd..091e6f80b 100644
29 --- a/sys-cluster/otf2/files/otf2-2.3-respect-flags.patch
30 +++ b/sys-cluster/otf2/files/otf2-2.3-respect-flags.patch
31 @@ -1,267 +1,3 @@
32 ---- a/build-config/common/platforms/compiler-frontend-clang
33 -+++ b/build-config/common/platforms/compiler-frontend-clang
34 -@@ -1,12 +1,12 @@
35 --CC_FOR_BUILD=clang
36 --CXX_FOR_BUILD=clang++
37 --F77_FOR_BUILD=flang
38 --FC_FOR_BUILD=flang
39 -+CC_FOR_BUILD="$(CC)"
40 -+CXX_FOR_BUILD="$(CXX)"
41 -+F77_FOR_BUILD="$(F77)"
42 -+FC_FOR_BUILD="$(FC)"
43 -
44 --#CPPFLAGS_FOR_BUILD=
45 --#CFLAGS_FOR_BUILD=
46 --#CXXFLAGS_FOR_BUILD=
47 --#FFLAGS_FOR_BUILD=
48 --#FCFLAGS_FOR_BUILD=
49 --#LDFLAGS_FOR_BUILD=
50 -+CPPFLAGS_FOR_BUILD="$(CPPFLAGS)"
51 -+CFLAGS_FOR_BUILD="$(CFLAGS)"
52 -+CXXFLAGS_FOR_BUILD="$(CXXFLAGS)"
53 -+FFLAGS_FOR_BUILD="$(FFLAGS)"
54 -+FCFLAGS_FOR_BUILD="$(FCFLAGS)"
55 -+LDFLAGS_FOR_BUILD="$(LDFLAGS)"
56 - #LIBS_FOR_BUILD=
57 ---- a/build-config/common/platforms/compiler-frontend-gcc
58 -+++ b/build-config/common/platforms/compiler-frontend-gcc
59 -@@ -1,12 +1,12 @@
60 --CC_FOR_BUILD=gcc
61 --CXX_FOR_BUILD=g++
62 --F77_FOR_BUILD=gfortran
63 --FC_FOR_BUILD=gfortran
64 -+CC_FOR_BUILD="$(CC)"
65 -+CXX_FOR_BUILD="$(CXX)"
66 -+F77_FOR_BUILD="$(F77)"
67 -+FC_FOR_BUILD="$(FC)"
68 -
69 --#CPPFLAGS_FOR_BUILD=
70 --#CFLAGS_FOR_BUILD=
71 --#CXXFLAGS_FOR_BUILD=
72 --#FFLAGS_FOR_BUILD=
73 --#FCFLAGS_FOR_BUILD=
74 --#LDFLAGS_FOR_BUILD=
75 -+CPPFLAGS_FOR_BUILD="$(CPPFLAGS)"
76 -+CFLAGS_FOR_BUILD="$(CFLAGS)"
77 -+CXXFLAGS_FOR_BUILD="$(CXXFLAGS)"
78 -+FFLAGS_FOR_BUILD="$(FFLAGS)"
79 -+FCFLAGS_FOR_BUILD="$(FCFLAGS)"
80 -+LDFLAGS_FOR_BUILD="$(LDFLAGS)"
81 - #LIBS_FOR_BUILD=
82 ---- a/build-config/common/platforms/compiler-mpi-mpich
83 -+++ b/build-config/common/platforms/compiler-mpi-mpich
84 -@@ -1,10 +1,10 @@
85 --MPICC=mpicc -cc={CC}
86 -+#MPICC=mpicc -cc={CC}
87 - #MPI_CFLAGS
88 --MPICXX=mpicxx -CC={CXX}
89 -+#MPICXX=mpicxx -CC={CXX}
90 - #MPI_CXXFLAGS=
91 --MPIF77=mpif77 -f77={F77}
92 -+#MPIF77=mpif77 -f77={F77}
93 - #MPI_FFLAGS=
94 --MPIFC=mpif90 -f90={FC}
95 -+#MPIFC=mpif90 -f90={FC}
96 - #MPI_FCFLAGS=
97 - #MPI_CPPFLAGS=
98 - #MPI_LDFLAGS=
99 ---- a/build-config/common/platforms/compiler-mpi-mpich2
100 -+++ b/build-config/common/platforms/compiler-mpi-mpich2
101 -@@ -1,12 +1,12 @@
102 --MPICC=mpicc -cc={CC}
103 -+#MPICC=mpicc -cc={CC}
104 - #MPI_CFLAGS
105 --MPICXX=mpicxx -cxx={CXX}
106 -+#MPICXX=mpicxx -cxx={CXX}
107 - #MPI_CXXFLAGS=
108 --MPIF77=mpif77 -f77={F77}
109 -+#MPIF77=mpif77 -f77={F77}
110 - #MPI_FFLAGS=
111 --MPIFC=mpif90 -f90={FC}
112 -+#MPIFC=mpif90 -f90={FC}
113 - #MPI_FCFLAGS=
114 --MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX
115 -+MPI_CPPFLAGS="${MPI_CPPFLAGS} -DMPICH_SKIP_MPICXX"
116 - #MPI_LDFLAGS=
117 - #MPI_LIBS=
118 -
119 ---- a/build-config/common/platforms/compiler-mpi-mpich3
120 -+++ b/build-config/common/platforms/compiler-mpi-mpich3
121 -@@ -1,12 +1,12 @@
122 --MPICC=mpicc -cc={CC}
123 -+#MPICC=mpicc -cc={CC}
124 - #MPI_CFLAGS
125 --MPICXX=mpicxx -cxx={CXX}
126 -+#MPICXX=mpicxx -cxx={CXX}
127 - #MPI_CXXFLAGS=
128 --MPIF77=mpif77 -fc={F77}
129 -+#MPIF77=mpif77 -fc={F77}
130 - #MPI_FFLAGS=
131 --MPIFC=mpif90 -fc={FC}
132 -+#MPIFC=mpif90 -fc={FC}
133 - #MPI_FCFLAGS=
134 --MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX
135 -+MPI_CPPFLAGS="${MPI_CPPFLAGS} -DMPICH_SKIP_MPICXX"
136 - #MPI_LDFLAGS=
137 - #MPI_LIBS=
138 -
139 ---- a/build-config/common/platforms/compiler-mpi-openmpi
140 -+++ b/build-config/common/platforms/compiler-mpi-openmpi
141 -@@ -1,10 +1,10 @@
142 --MPICC=mpicc
143 -+#MPICC=mpicc
144 - #MPI_CFLAGS
145 --MPICXX=mpicxx
146 -+#MPICXX=mpicxx
147 - #MPI_CXXFLAGS=
148 --MPIF77=mpif77
149 -+#MPIF77=mpif77
150 - #MPI_FFLAGS=
151 --MPIFC=mpif90
152 -+#MPIFC=mpif90
153 - #MPI_FCFLAGS=
154 - #MPI_CPPFLAGS=
155 - #MPI_LDFLAGS=
156 ---- a/build-config/common/platforms/compiler-mpi-openmpi3
157 -+++ b/build-config/common/platforms/compiler-mpi-openmpi3
158 -@@ -1,10 +1,10 @@
159 --MPICC=mpicc
160 -+#MPICC=mpicc
161 - #MPI_CFLAGS
162 --MPICXX=mpicxx
163 -+#MPICXX=mpicxx
164 - #MPI_CXXFLAGS=
165 --MPIF77=mpif77
166 -+#MPIF77=mpif77
167 - #MPI_FFLAGS=
168 --MPIFC=mpif90
169 -+#MPIFC=mpif90
170 - #MPI_FCFLAGS=
171 - #MPI_CPPFLAGS=
172 - #MPI_LDFLAGS=
173 ---- a/build-config/common/platforms/compiler-nocross-clang
174 -+++ b/build-config/common/platforms/compiler-nocross-clang
175 -@@ -1,7 +1,7 @@
176 --CC=clang
177 --CXX=clang++
178 --F77=flang
179 --FC=flang
180 -+#CC=clang
181 -+#CXX=clang++
182 -+#F77=flang
183 -+#FC=flang
184 -
185 - #CPPFLAGS=
186 - #CFLAGS=
187 ---- a/build-config/common/platforms/compiler-nocross-gcc
188 -+++ b/build-config/common/platforms/compiler-nocross-gcc
189 -@@ -1,7 +1,7 @@
190 --CC=gcc
191 --CXX=g++
192 --F77=gfortran
193 --FC=gfortran
194 -+#CC=gcc
195 -+#CXX=g++
196 -+#F77=gfortran
197 -+#FC=gfortran
198 -
199 - #CPPFLAGS=
200 - #CFLAGS=
201 ---- a/build-config/common/platforms/platform-backend-linux
202 -+++ b/build-config/common/platforms/platform-backend-linux
203 -@@ -1,7 +1,7 @@
204 --CC=gcc
205 --CXX=g++
206 --F77=gfortran
207 --FC=gfortran
208 -+#CC=gcc
209 -+#CXX=g++
210 -+#F77=gfortran
211 -+#FC=gfortran
212 -
213 - #CPPFLAGS=
214 - #CFLAGS=
215 ---- a/build-config/common/platforms/platform-backend-user-provided
216 -+++ b/build-config/common/platforms/platform-backend-user-provided
217 -@@ -1,7 +1,7 @@
218 --CC=
219 --CXX=
220 --F77=
221 --FC=
222 -+#CC=
223 -+#CXX=
224 -+#F77=
225 -+#FC=
226 -
227 - #CPPFLAGS=
228 - #CFLAGS=
229 ---- a/build-config/common/platforms/platform-frontend-linux
230 -+++ b/build-config/common/platforms/platform-frontend-linux
231 -@@ -1,14 +1,14 @@
232 - # not a cross compile platform, frontend ignored
233 -
234 --#CC_FOR_BUILD=
235 --#CXX_FOR_BUILD=
236 --#F77_FOR_BUILD=
237 --#FC_FOR_BUILD=
238 -+#CC_FOR_BUILD="$(CC)"
239 -+#CXX_FOR_BUILD="$(CXX)"
240 -+#F77_FOR_BUILD="$(F77)"
241 -+#FC_FOR_BUILD="$(FC)"
242 -
243 --#CPPFLAGS_FOR_BUILD=
244 --#CFLAGS_FOR_BUILD=
245 --#CXXFLAGS_FOR_BUILD=
246 --#FFLAGS_FOR_BUILD=
247 --#FCFLAGS_FOR_BUILD=
248 --#LDFLAGS_FOR_BUILD=
249 -+#CPPFLAGS_FOR_BUILD="$(CPPFLAGS)"
250 -+#CFLAGS_FOR_BUILD="$(CFLAGS)"
251 -+#CXXFLAGS_FOR_BUILD="$(CXXFLAGS)"
252 -+#FFLAGS_FOR_BUILD="$(FFLAGS)"
253 -+#FCFLAGS_FOR_BUILD="$(FCFLAGS)"
254 -+#LDFLAGS_FOR_BUILD="$(LDFLAGS)"
255 - #LIBS_FOR_BUILD=
256 ---- a/build-config/common/platforms/platform-frontend-user-provided
257 -+++ b/build-config/common/platforms/platform-frontend-user-provided
258 -@@ -1,12 +1,12 @@
259 --CC_FOR_BUILD=
260 --CXX_FOR_BUILD=
261 --F77_FOR_BUILD=
262 --FC_FOR_BUILD=
263 -+CC_FOR_BUILD="$(CC)"
264 -+CXX_FOR_BUILD="$(CXX)"
265 -+F77_FOR_BUILD="$(F77)"
266 -+FC_FOR_BUILD="$(FC)"
267 -
268 --CPPFLAGS_FOR_BUILD=
269 --CFLAGS_FOR_BUILD=
270 --CXXFLAGS_FOR_BUILD=
271 --FFLAGS_FOR_BUILD=
272 --FCFLAGS_FOR_BUILD=
273 --LDFLAGS_FOR_BUILD=
274 --LIBS_FOR_BUILD=
275 -+CPPFLAGS_FOR_BUILD="$(CPPFLAGS)"
276 -+CFLAGS_FOR_BUILD="$(CFLAGS)"
277 -+CXXFLAGS_FOR_BUILD="$(CXXFLAGS)"
278 -+FFLAGS_FOR_BUILD="$(FFLAGS)"
279 -+FCFLAGS_FOR_BUILD="$(FCFLAGS)"
280 -+LDFLAGS_FOR_BUILD="$(LDFLAGS)"
281 -+#LIBS_FOR_BUILD=
282 ---- a/build-config/common/platforms/platform-mpi-user-provided
283 -+++ b/build-config/common/platforms/platform-mpi-user-provided
284 -@@ -1,7 +1,7 @@
285 --MPICC=
286 --MPICXX=
287 --MPIF77=
288 --MPIFC=
289 -+#MPICC=
290 -+#MPICXX=
291 -+#MPIF77=
292 -+#MPIFC=
293 -
294 - #MPI_LDFLAGS=
295 - #MPI_LIBS=
296 --- a/doc/examples/Makefile
297 +++ b/doc/examples/Makefile
298 @@ -37,78 +37,78 @@
299
300 diff --git a/sys-cluster/otf2/files/otf2-3.0-respect-flags.patch b/sys-cluster/otf2/files/otf2-3.0-respect-flags.patch
301 new file mode 100644
302 index 000000000..6fd8c6ca5
303 --- /dev/null
304 +++ b/sys-cluster/otf2/files/otf2-3.0-respect-flags.patch
305 @@ -0,0 +1,95 @@
306 +--- a/doc/examples/Makefile
307 ++++ b/doc/examples/Makefile
308 +@@ -37,78 +37,78 @@
309 + pthread: $(ALL_PTHREAD)
310 +
311 + otf2_reader_example.o: otf2_reader_example.c
312 +- gcc -std=c99 `otf2-config --cflags` \
313 ++ $(CC) $(CFLAGS) -fPIC -std=c99 `otf2-config --cflags` \
314 + -c otf2_reader_example.c \
315 + -o otf2_reader_example.o
316 +
317 + otf2_reader_example: otf2_reader_example.o
318 +- gcc otf2_reader_example.o \
319 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE otf2_reader_example.o \
320 + `otf2-config --ldflags` \
321 + `otf2-config --libs` \
322 + -o otf2_reader_example
323 +
324 + otf2_writer_example.o: otf2_writer_example.c
325 +- gcc -std=c99 `otf2-config --cflags` \
326 ++ $(CC) $(CFLAGS) -fPIC -std=c99 `otf2-config --cflags` \
327 + -c otf2_writer_example.c \
328 + -o otf2_writer_example.o
329 +
330 + otf2_writer_example: otf2_writer_example.o
331 +- gcc otf2_writer_example.o \
332 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE otf2_writer_example.o \
333 + `otf2-config --ldflags` \
334 + `otf2-config --libs` \
335 + -o otf2_writer_example
336 +
337 + otf2_mpi_reader_example.o: otf2_mpi_reader_example.c
338 +- mpicc -std=c99 `otf2-config --cflags` \
339 ++ $(MPICC) $(CFLAGS) -fPIC -std=c99 `otf2-config --cflags` \
340 + -c otf2_mpi_reader_example.c \
341 + -o otf2_mpi_reader_example.o
342 +
343 + otf2_mpi_reader_example: otf2_mpi_reader_example.o
344 +- mpicc otf2_mpi_reader_example.o \
345 ++ $(MPICC) $(CFLAGS) $(LDFLAGS) -fPIE otf2_mpi_reader_example.o \
346 + `otf2-config --ldflags` \
347 + `otf2-config --libs` \
348 + -o otf2_mpi_reader_example
349 +
350 + otf2_mpi_reader_example_cc.o: otf2_mpi_reader_example.cc
351 +- mpic++ `otf2-config --cflags` \
352 ++ $(MPICXX) $(CXXFLAGS) -fPIC \
353 + -c otf2_mpi_reader_example.cc \
354 + -o otf2_mpi_reader_example_cc.o
355 +
356 + otf2_mpi_reader_example_cc: otf2_mpi_reader_example_cc.o
357 +- mpic++ otf2_mpi_reader_example_cc.o \
358 ++ $(MPICXX) $(CXXFLAGS) $(LDFLAGS) -fPIE otf2_mpi_reader_example_cc.o \
359 + `otf2-config --ldflags` \
360 + `otf2-config --libs` \
361 + -o otf2_mpi_reader_example_cc
362 +
363 + otf2_mpi_writer_example.o: otf2_mpi_writer_example.c
364 +- mpicc -std=c99 `otf2-config --cflags` \
365 ++ $(MPICC) $(CFLAGS) -fPIC -std=c99 `otf2-config --cflags` \
366 + -c otf2_mpi_writer_example.c \
367 + -o otf2_mpi_writer_example.o
368 +
369 + otf2_mpi_writer_example: otf2_mpi_writer_example.o
370 +- mpicc otf2_mpi_writer_example.o \
371 ++ $(MPICC) $(CFLAGS) $(LDFLAGS) -fPIE otf2_mpi_writer_example.o \
372 + `otf2-config --ldflags` \
373 + `otf2-config --libs` \
374 + -o otf2_mpi_writer_example
375 +
376 + otf2_openmp_writer_example.o: otf2_openmp_writer_example.c
377 +- gcc -std=c99 -fopenmp `otf2-config --cflags` \
378 ++ $(CC) $(CFLAGS) -fPIC -std=c99 -fopenmp `otf2-config --cflags` \
379 + -c otf2_openmp_writer_example.c \
380 + -o otf2_openmp_writer_example.o
381 +
382 + otf2_openmp_writer_example: otf2_openmp_writer_example.o
383 +- gcc -fopenmp otf2_openmp_writer_example.o \
384 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -fopenmp otf2_openmp_writer_example.o \
385 + `otf2-config --ldflags` \
386 + `otf2-config --libs` \
387 + -o otf2_openmp_writer_example
388 +
389 + otf2_pthread_writer_example.o: otf2_pthread_writer_example.c
390 +- gcc -std=c99 -pthread `otf2-config --cflags` \
391 ++ $(CC) $(CFLAGS) -fPIC -std=c99 -pthread `otf2-config --cflags` \
392 + -c otf2_pthread_writer_example.c \
393 + -o otf2_pthread_writer_example.o
394 +
395 + otf2_pthread_writer_example: otf2_pthread_writer_example.o
396 +- gcc -pthread otf2_pthread_writer_example.o \
397 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -pthread otf2_pthread_writer_example.o \
398 + `otf2-config --ldflags` \
399 + `otf2-config --libs` \
400 + -o otf2_pthread_writer_example
401
402 diff --git a/sys-cluster/otf2/otf2-2.3-r2.ebuild b/sys-cluster/otf2/otf2-2.3-r3.ebuild
403 similarity index 58%
404 copy from sys-cluster/otf2/otf2-2.3-r2.ebuild
405 copy to sys-cluster/otf2/otf2-2.3-r3.ebuild
406 index 8bc469478..32afecbb0 100644
407 --- a/sys-cluster/otf2/otf2-2.3-r2.ebuild
408 +++ b/sys-cluster/otf2/otf2-2.3-r3.ebuild
409 @@ -12,7 +12,7 @@ HOMEPAGE="https://www.vi-hps.org/projects/score-p"
410 SRC_URI="https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/${P}/${P}.tar.gz"
411
412 LICENSE="BSD"
413 -SLOT="0"
414 +SLOT="0/2.3"
415 KEYWORDS="~amd64"
416 IUSE="debug sionlib test"
417
418 @@ -31,23 +31,48 @@ PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" )
419
420 src_configure() {
421 tc-export CC CXX FC F77 CPP
422 -
423 - export MPICC=/usr/bin/mpicc
424 - export MPICXX=/usr/bin/mpicxx
425 - export MPIF77=/usr/bin/mpif77
426 - export MPIFC=/usr/bin/mpifc
427 -
428 - export MPI_CFLAGS="${CFLAGS}"
429 - export MPI_CXXFLAGS="${CXXFLAGS}"
430 - export MPI_CPPFLAGS="${CPPFLAGS}"
431 - export MPI_F77LAGS="${F77FLAGS}"
432 - export MPI_FCLAGS="${FCFLAGS}"
433 - export MPI_LDFLAGS="${LDFLAGS}"
434 + rm build-config/common/platforms/platform-* || die
435 +
436 + cat > build-config/common/platforms/platform-backend-user-provided <<-EOF || die
437 + CC=${CC}
438 + CXX=${CXX}
439 + FC=${FC}
440 + F77=${F77}
441 + CPP=${CPP}
442 + CXXCPP=${CPP}
443 + EOF
444 +
445 + cat > build-config/common/platforms/platform-frontend-user-provided <<-EOF || die
446 + CC_FOR_BUILD=${CC}
447 + F77_FOR_BUILD=${F77}
448 + FC_FOR_BUILD=${FC}
449 + CXX_FOR_BUILD=${CXX}
450 + LDFLAGS_FOR_BUILD=${LDFLAGS}
451 + CFLAGS_FOR_BUILD=${CFLAGS}
452 + CXXFLAGS_FOR_BUILD=${CXXFLAGS}
453 + CPPFLAGS_FOR_BUILD=${CPPFLAGS}
454 + FCFLAGS_FOR_BUILD=${FCFLAGS}
455 + FFLAGS_FOR_BUILD=${FFLAGS}
456 + EOF
457 +
458 + cat > build-config/common/platforms/platform-mpi-user-provided <<-EOF || die
459 + MPICC=mpicc
460 + MPICXX=mpicxx
461 + MPIF77=mpif77
462 + MPIFC=mpif90
463 + MPI_CPPFLAGS=${CPPFLAGS}
464 + MPI_CFLAGS=${CFLAGS}
465 + MPI_CXXFLAGS=${CXXFLAGS}
466 + MPI_FFLAGS=${FFLAGS}
467 + MPI_FCFLAGS=${FCFLAGS}
468 + MPI_LDFLAGS=${LDFLAGS}
469 + EOF
470
471 local myconf=(
472 --disable-platform-mic
473 --disable-static
474 --enable-shared
475 + --with-custom-compilers
476
477 $(use_enable test backend-test-runs)
478 $(use_enable debug)
479
480 diff --git a/sys-cluster/otf2/otf2-2.3-r2.ebuild b/sys-cluster/otf2/otf2-3.0.ebuild
481 similarity index 58%
482 rename from sys-cluster/otf2/otf2-2.3-r2.ebuild
483 rename to sys-cluster/otf2/otf2-3.0.ebuild
484 index 8bc469478..d311a9f03 100644
485 --- a/sys-cluster/otf2/otf2-2.3-r2.ebuild
486 +++ b/sys-cluster/otf2/otf2-3.0.ebuild
487 @@ -12,7 +12,7 @@ HOMEPAGE="https://www.vi-hps.org/projects/score-p"
488 SRC_URI="https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/${P}/${P}.tar.gz"
489
490 LICENSE="BSD"
491 -SLOT="0"
492 +SLOT="0/3.0"
493 KEYWORDS="~amd64"
494 IUSE="debug sionlib test"
495
496 @@ -31,23 +31,48 @@ PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" )
497
498 src_configure() {
499 tc-export CC CXX FC F77 CPP
500 -
501 - export MPICC=/usr/bin/mpicc
502 - export MPICXX=/usr/bin/mpicxx
503 - export MPIF77=/usr/bin/mpif77
504 - export MPIFC=/usr/bin/mpifc
505 -
506 - export MPI_CFLAGS="${CFLAGS}"
507 - export MPI_CXXFLAGS="${CXXFLAGS}"
508 - export MPI_CPPFLAGS="${CPPFLAGS}"
509 - export MPI_F77LAGS="${F77FLAGS}"
510 - export MPI_FCLAGS="${FCFLAGS}"
511 - export MPI_LDFLAGS="${LDFLAGS}"
512 + rm build-config/common/platforms/platform-* || die
513 +
514 + cat > build-config/common/platforms/platform-backend-user-provided <<-EOF || die
515 + CC=${CC}
516 + CXX=${CXX}
517 + FC=${FC}
518 + F77=${F77}
519 + CPP=${CPP}
520 + CXXCPP=${CPP}
521 + EOF
522 +
523 + cat > build-config/common/platforms/platform-frontend-user-provided <<-EOF || die
524 + CC_FOR_BUILD=${CC}
525 + F77_FOR_BUILD=${F77}
526 + FC_FOR_BUILD=${FC}
527 + CXX_FOR_BUILD=${CXX}
528 + LDFLAGS_FOR_BUILD=${LDFLAGS}
529 + CFLAGS_FOR_BUILD=${CFLAGS}
530 + CXXFLAGS_FOR_BUILD=${CXXFLAGS}
531 + CPPFLAGS_FOR_BUILD=${CPPFLAGS}
532 + FCFLAGS_FOR_BUILD=${FCFLAGS}
533 + FFLAGS_FOR_BUILD=${FFLAGS}
534 + EOF
535 +
536 + cat > build-config/common/platforms/platform-mpi-user-provided <<-EOF || die
537 + MPICC=mpicc
538 + MPICXX=mpicxx
539 + MPIF77=mpif77
540 + MPIFC=mpif90
541 + MPI_CPPFLAGS=${CPPFLAGS}
542 + MPI_CFLAGS=${CFLAGS}
543 + MPI_CXXFLAGS=${CXXFLAGS}
544 + MPI_FFLAGS=${FFLAGS}
545 + MPI_FCFLAGS=${FCFLAGS}
546 + MPI_LDFLAGS=${LDFLAGS}
547 + EOF
548
549 local myconf=(
550 --disable-platform-mic
551 --disable-static
552 --enable-shared
553 + --with-custom-compilers
554
555 $(use_enable test backend-test-runs)
556 $(use_enable debug)
Report Message
Find on MARC Find on Google Groups