| 1 |
commit: 5dc0080ec40442263b23644e0d7d3050520c0a03 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 29 22:28:32 2021 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Aug 29 22:33:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5dc0080e |
| 7 |
|
| 8 |
sys-cluster/sionlibl: fix other linking issues |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
.../files/sionlibl-build-shared-libraries.patch | 48 ++++++++++++++++------ |
| 13 |
...bl-1.7.7-r2.ebuild => sionlibl-1.7.7-r3.ebuild} | 6 ++- |
| 14 |
2 files changed, 40 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch |
| 17 |
index ac0f5a39d..357fd7a88 100644 |
| 18 |
--- a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch |
| 19 |
+++ b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch |
| 20 |
@@ -111,9 +111,16 @@ |
| 21 |
# Dependencies |
| 22 |
--- a/src/lib/Makefile |
| 23 |
+++ b/src/lib/Makefile |
| 24 |
-@@ -67,25 +67,25 @@ |
| 25 |
+@@ -66,26 +66,32 @@ |
| 26 |
+ SION_CXX_HDR = sion_cxx.h |
| 27 |
endif |
| 28 |
|
| 29 |
++ifneq ($(PTHREADSUPPORT),"no") |
| 30 |
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_PTHREADS) |
| 31 |
++else |
| 32 |
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_NONE) |
| 33 |
++endif |
| 34 |
++ |
| 35 |
USER_HDRS = sion.h sion_libversion_rep.h sion_common.h sion_serial.h sion_const.h sion_datatypes.h sion_platform.h sion_debug.h $(SION_CXX_HDR) |
| 36 |
-USER_LIBS = lib$(SION_LIBNAME_SER).a lib$(SION_LIBNAME_COM).a lib$(SION_LIBNAME_COM_LOCK_PTHREADS).a lib$(SION_LIBNAME_COM_LOCK_NONE).a |
| 37 |
+USER_LIBS = lib$(SION_LIBNAME_SER).so lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_COM_LOCK_PTHREADS).so lib$(SION_LIBNAME_COM_LOCK_NONE).so |
| 38 |
@@ -124,8 +131,8 @@ |
| 39 |
|
| 40 |
-lib$(SION_LIBNAME_COM).a : $(SION_COMMON_OBJS) |
| 41 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_COMMON_OBJS) |
| 42 |
-+lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) |
| 43 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@ $(SION_COMMON_OBJS) |
| 44 |
++lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) lib$(LOCKLIB).so |
| 45 |
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@ $(SION_COMMON_OBJS) $(SIONFWD_LIBS) -L. -l$(LOCKLIB) |
| 46 |
@echo "*** $@ built" |
| 47 |
|
| 48 |
-lib$(SION_LIBNAME_COM_LOCK_PTHREADS).a : $(SION_COMMON_LOCK_PTHREADS_OBJS) |
| 49 |
@@ -147,7 +154,7 @@ |
| 50 |
@echo "*** $@ built" |
| 51 |
|
| 52 |
sion_lock_pthreads.o: sion_lock.c |
| 53 |
-@@ -178,7 +178,7 @@ |
| 54 |
+@@ -178,7 +184,7 @@ |
| 55 |
done |
| 56 |
|
| 57 |
clean: |
| 58 |
@@ -211,26 +218,26 @@ |
| 59 |
|
| 60 |
-lib$(SION_LIBNAME_GEN).a : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) |
| 61 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) |
| 62 |
-+lib$(SION_LIBNAME_GEN).so : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) |
| 63 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) |
| 64 |
++lib$(SION_LIBNAME_GEN).so : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 65 |
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) -L../lib -l$(SION_LIBNAME_COM) |
| 66 |
@echo "*** $@ built" |
| 67 |
|
| 68 |
-lib$(SION_LIBNAME_OMP).a : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) |
| 69 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) |
| 70 |
-+lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) |
| 71 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) $(OMPFLAG) |
| 72 |
++lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 73 |
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) -L../lib -l$(SION_LIBNAME_COM) -L. -l$(SION_LIBNAME_GEN) $(OMPFLAG) |
| 74 |
@echo "*** $@ built" |
| 75 |
|
| 76 |
-lib$(SION_LIBNAME_MPI).a : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) |
| 77 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) |
| 78 |
-+lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) |
| 79 |
-+ $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) |
| 80 |
++lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 81 |
++ $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) -L../lib -l$(SION_LIBNAME_COM) -L. -l$(SION_LIBNAME_GEN) |
| 82 |
@echo "*** $@ built" |
| 83 |
|
| 84 |
-lib$(SION_LIBNAME_OMPI).a : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) |
| 85 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) |
| 86 |
-+lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) |
| 87 |
-+ $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) $(HYBFLAG) |
| 88 |
++lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 89 |
++ $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) -L../lib -l$(SION_LIBNAME_COM) -L. -l$(SION_LIBNAME_GEN) $(HYBFLAG) |
| 90 |
@echo "*** $@ built" |
| 91 |
|
| 92 |
sion_generic.o : sion_generic.c |
| 93 |
@@ -245,6 +252,23 @@ |
| 94 |
# Dependencies |
| 95 |
--- a/src/parutils/Makefile |
| 96 |
+++ b/src/parutils/Makefile |
| 97 |
+@@ -30,12 +30,12 @@ |
| 98 |
+ COMPFLAGS = $(OMPMFLAG) $(OMPFLAG) |
| 99 |
+ CHYBFLAGS = $(HYBMFLAG) $(HYBFLAG) |
| 100 |
+ |
| 101 |
+-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) |
| 102 |
++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) |
| 103 |
+ |
| 104 |
+-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) |
| 105 |
+-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) |
| 106 |
++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) |
| 107 |
++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) |
| 108 |
+ |
| 109 |
+-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) |
| 110 |
++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) |
| 111 |
+ FOMPLDFLAGS = $(COMPLDFLAGS) $(OMPFLAG) |
| 112 |
+ FHYBLDFLAGS = $(COMPILDFLAGS) $(OMPFLAG) |
| 113 |
+ |
| 114 |
@@ -55,6 +55,13 @@ |
| 115 |
ifeq ($(FORTRANENABLE),1) |
| 116 |
ifeq ($(MPIENABLE),1) |
| 117 |
|
| 118 |
diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r2.ebuild b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild |
| 119 |
similarity index 97% |
| 120 |
rename from sys-cluster/sionlibl/sionlibl-1.7.7-r2.ebuild |
| 121 |
rename to sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild |
| 122 |
index 299438e5d..ed9809f65 100644 |
| 123 |
--- a/sys-cluster/sionlibl/sionlibl-1.7.7-r2.ebuild |
| 124 |
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild |
| 125 |
@@ -65,9 +65,13 @@ src_configure() { |
| 126 |
use hostname-regex && msa="hostname-regex" |
| 127 |
|
| 128 |
local myconf=( |
| 129 |
+ --disable-gcovr |
| 130 |
+ --disable-kcov |
| 131 |
--disable-mic |
| 132 |
--msa="${msa}" |
| 133 |
--prefix="${T}/prefix/usr" |
| 134 |
+ $(use_enable debug) |
| 135 |
+ $(use_enable pthreads) |
| 136 |
) |
| 137 |
|
| 138 |
#custom configure? |
| 139 |
@@ -77,9 +81,7 @@ src_configure() { |
| 140 |
use ompi || myconf+=( "--disable-ompi" ) |
| 141 |
use openmp || myconf+=( "--disable-omp" ) |
| 142 |
use parutils || myconf+=( "--disable-parutils" ) |
| 143 |
- use pthreads || myconf+=( "--disable-pthreads" ) |
| 144 |
|
| 145 |
- use debug && myconf+=( "--enable-debug" ) |
| 146 |
use python && myconf+=( "--enable-python=3" ) |
| 147 |
use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" ) |
Archives