1 |
commit: e79ca7867a7db7b1026a116a67347d69b62f4607 |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Aug 29 23:13:13 2021 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Sun Aug 29 23:13:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e79ca786 |
7 |
|
8 |
sys-cluster/sionlibl: reorder library link |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
.../files/sionlibl-build-shared-libraries.patch | 26 +++++++++++++--------- |
13 |
1 file changed, 16 insertions(+), 10 deletions(-) |
14 |
|
15 |
diff --git a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch |
16 |
index 357fd7a88..b48e7ea64 100644 |
17 |
--- a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch |
18 |
+++ b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch |
19 |
@@ -252,24 +252,30 @@ |
20 |
# Dependencies |
21 |
--- a/src/parutils/Makefile |
22 |
+++ b/src/parutils/Makefile |
23 |
-@@ -30,12 +30,12 @@ |
24 |
+@@ -30,12 +30,18 @@ |
25 |
COMPFLAGS = $(OMPMFLAG) $(OMPFLAG) |
26 |
CHYBFLAGS = $(HYBMFLAG) $(HYBFLAG) |
27 |
|
28 |
-CMPILDFLAGS = $(LDFLAGS) -L../parlib -l$(SION_LIBNAME_MPI) -L../lib -l$(SION_LIBNAME_GEN) -L../lib -l$(SION_LIBNAME_COM) -l$(SION_LIBNAME_COM_LOCK_PTHREADS) $(HINTSLIB) $(CACHELIB) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
29 |
-+CMPILDFLAGS = $(LDFLAGS) -L../parlib -l$(SION_LIBNAME_MPI) -L../lib -l$(SION_LIBNAME_GEN) -L../lib -l$(SION_LIBNAME_COM) $(HINTSLIB) $(CACHELIB) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
30 |
- |
31 |
++ifneq ($(PTHREADSUPPORT),"no") |
32 |
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_PTHREADS) |
33 |
++else |
34 |
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_NONE) |
35 |
++endif |
36 |
++ |
37 |
++CMPILDFLAGS = $(LDFLAGS) -L../lib -l$(LOCKLIB) -L../lib -l$(SION_LIBNAME_COM) -L../parlib -l$(SION_LIBNAME_GEN) -L../parlib -l$(SION_LIBNAME_MPI) $(HINTSLIB) $(CACHELIB) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
38 |
+ |
39 |
-COMPLDFLAGS = $(LDFLAGS) -L../parlib -l$(SION_LIBNAME_OMP) -L../lib -l$(SION_LIBNAME_COM) -l$(SION_LIBNAME_COM_LOCK_PTHREADS) $(HINTSLIB) $(CACHELIB) $(OMPFLAG) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
40 |
-CHYBLDFLAGS = $(LDFLAGS) -L../parlib -l$(SION_LIBNAME_OMPI) -L../lib -l$(SION_LIBNAME_GEN) -L../lib -l$(SION_LIBNAME_COM) -l$(SION_LIBNAME_COM_LOCK_PTHREADS) $(HINTSLIB) $(CACHELIB) $(OMPFLAG) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
41 |
-+COMPLDFLAGS = $(LDFLAGS) -L../parlib -l$(SION_LIBNAME_OMP) -L../lib -l$(SION_LIBNAME_COM) $(HINTSLIB) $(CACHELIB) $(OMPFLAG) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
42 |
-+CHYBLDFLAGS = $(LDFLAGS) -L../parlib -l$(SION_LIBNAME_OMPI) -L../lib -l$(SION_LIBNAME_GEN) -L../lib -l$(SION_LIBNAME_COM) $(HINTSLIB) $(CACHELIB) $(OMPFLAG) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
43 |
++COMPLDFLAGS = $(LDFLAGS) -L../lib -l$(LOCKLIB) -L../lib -l$(SION_LIBNAME_COM) -L../parlib -l$(SION_LIBNAME_OMP) $(HINTSLIB) $(CACHELIB) $(OMPFLAG) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
44 |
++CHYBLDFLAGS = $(LDFLAGS) -L../lib -l$(LOCKLIB) -L../lib -l$(SION_LIBNAME_COM) -L../parlib -l$(SION_LIBNAME_GEN) -L../parlib -l$(SION_LIBNAME_OMPI) $(HINTSLIB) $(CACHELIB) $(OMPFLAG) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
45 |
|
46 |
-FMPILDFLAGS = $(LDFLAGS) -L../parlib -l$(SION_LIBNAME_MPI) -L../lib -l$(SION_LIBNAME_GEN) -L../lib -l$(SION_LIBNAME_SER) -l$(SION_LIBNAME_COM) -l$(SION_LIBNAME_COM_LOCK_PTHREADS) $(HINTSLIB) $(CACHELIB) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
47 |
-+FMPILDFLAGS = $(LDFLAGS) -L../parlib -l$(SION_LIBNAME_MPI) -L../lib -l$(SION_LIBNAME_GEN) -L../lib -l$(SION_LIBNAME_SER) -l$(SION_LIBNAME_COM) $(HINTSLIB) $(CACHELIB) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
48 |
++FMPILDFLAGS = $(LDFLAGS) -L../lib -l$(LOCKLIB) -L../lib -l$(SION_LIBNAME_COM) -L../lib -l$(SION_LIBNAME_SER) -L../parlib -l$(SION_LIBNAME_GEN) -L../parlib -l$(SION_LIBNAME_MPI) $(HINTSLIB) $(CACHELIB) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
49 |
FOMPLDFLAGS = $(COMPLDFLAGS) $(OMPFLAG) |
50 |
FHYBLDFLAGS = $(COMPILDFLAGS) $(OMPFLAG) |
51 |
|
52 |
-@@ -55,6 +55,13 @@ |
53 |
+@@ -55,6 +61,13 @@ |
54 |
ifeq ($(FORTRANENABLE),1) |
55 |
ifeq ($(MPIENABLE),1) |
56 |
USER_UTILS += fpartest |
57 |
@@ -283,7 +289,7 @@ |
58 |
endif |
59 |
endif |
60 |
|
61 |
-@@ -75,10 +82,10 @@ |
62 |
+@@ -75,10 +88,10 @@ |
63 |
|
64 |
all: $(USER_UTILS) |
65 |
|
66 |
@@ -296,7 +302,7 @@ |
67 |
$(HYBCC) -o $@ $(PARTEST_OMPI_OBJS) $(CHYBLDFLAGS) -L../parlib -l$(SION_LIBNAME_OMP) -L../lib -l$(SION_LIBNAME_SER) $(MPILIB) |
68 |
|
69 |
ompi_partest.o : ompi_partest.c |
70 |
-@@ -114,8 +121,8 @@ |
71 |
+@@ -114,8 +127,8 @@ |
72 |
fpartest.o : fpartest.F90 |
73 |
$(MPIF90) $(FFLAGS) -c fpartest.F90 |
74 |
|
75 |
@@ -307,7 +313,7 @@ |
76 |
|
77 |
|
78 |
install: all |
79 |
-@@ -161,7 +168,7 @@ |
80 |
+@@ -161,7 +174,7 @@ |
81 |
@rm -f header.tmp |
82 |
|
83 |
clean: |