commit: 5dc0080ec40442263b23644e0d7d3050520c0a03
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Aug 29 22:28:32 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Aug 29 22:33:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5dc0080e
sys-cluster/sionlibl: fix other linking issues
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../files/sionlibl-build-shared-libraries.patch | 48 ++++++++++++++++------
...bl-1.7.7-r2.ebuild => sionlibl-1.7.7-r3.ebuild} | 6 ++-
2 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch
b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch
index ac0f5a39d..357fd7a88 100644
--- a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch
+++ b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch
@@ -111,9 +111,16 @@
# Dependencies
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
-@@ -67,25 +67,25 @@
+@@ -66,26 +66,32 @@
+ SION_CXX_HDR = sion_cxx.h
endif
++ifneq ($(PTHREADSUPPORT),"no")
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_PTHREADS)
++else
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_NONE)
++endif
++
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)
-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
+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
@@ -124,8 +131,8 @@
-lib$(SION_LIBNAME_COM).a : $(SION_COMMON_OBJS)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_COMMON_OBJS)
-+lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS)
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@
$(SION_COMMON_OBJS)
++lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) lib$(LOCKLIB).so
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@
$(SION_COMMON_OBJS) $(SIONFWD_LIBS) -L. -l$(LOCKLIB)
@echo "*** $@ built"
-lib$(SION_LIBNAME_COM_LOCK_PTHREADS).a : $(SION_COMMON_LOCK_PTHREADS_OBJS)
@@ -147,7 +154,7 @@
@echo "*** $@ built"
sion_lock_pthreads.o: sion_lock.c
-@@ -178,7 +178,7 @@
+@@ -178,7 +184,7 @@
done
clean:
@@ -211,26 +218,26 @@
-lib$(SION_LIBNAME_GEN).a : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL)
-+lib$(SION_LIBNAME_GEN).so : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL)
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@
$(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK)
++lib$(SION_LIBNAME_GEN).so : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL)
../lib/lib$(SION_LIBNAME_COM).so
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@
$(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) -L../lib
-l$(SION_LIBNAME_COM)
@echo "*** $@ built"
-lib$(SION_LIBNAME_OMP).a : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL)
-+lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL)
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@
$(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) $(OMPFLAG)
++lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL)
../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so
++ $(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)
@echo "*** $@ built"
-lib$(SION_LIBNAME_MPI).a : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL)
-+lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL)
-+ $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@
$(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK)
++lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL)
../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so
++ $(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)
@echo "*** $@ built"
-lib$(SION_LIBNAME_OMPI).a : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL)
-+lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL)
-+ $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o
$@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) $(HYBFLAG)
++lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL)
../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so
++ $(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)
@echo "*** $@ built"
sion_generic.o : sion_generic.c
@@ -245,6 +252,23 @@
# Dependencies
--- a/src/parutils/Makefile
+++ b/src/parutils/Makefile
+@@ -30,12 +30,12 @@
+ COMPFLAGS = $(OMPMFLAG) $(OMPFLAG)
+ CHYBFLAGS = $(HYBMFLAG) $(HYBFLAG)
+
+-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)
++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)
+
+-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)
+-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)
++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)
++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)
+
+-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)
++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)
+ FOMPLDFLAGS = $(COMPLDFLAGS) $(OMPFLAG)
+ FHYBLDFLAGS = $(COMPILDFLAGS) $(OMPFLAG)
+
@@ -55,6 +55,13 @@
ifeq ($(FORTRANENABLE),1)
ifeq ($(MPIENABLE),1)
diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r2.ebuild
b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
similarity index 97%
rename from sys-cluster/sionlibl/sionlibl-1.7.7-r2.ebuild
rename to sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
index 299438e5d..ed9809f65 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7-r2.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
@@ -65,9 +65,13 @@ src_configure() {
use hostname-regex && msa="hostname-regex"
local myconf=(
+ --disable-gcovr
+ --disable-kcov
--disable-mic
--msa="${msa}"
--prefix="${T}/prefix/usr"
+ $(use_enable debug)
+ $(use_enable pthreads)
)
#custom configure?
@@ -77,9 +81,7 @@ src_configure() {
use ompi || myconf+=( "--disable-ompi" )
use openmp || myconf+=( "--disable-omp" )
use parutils || myconf+=( "--disable-parutils" )
- use pthreads || myconf+=( "--disable-pthreads" )
- use debug && myconf+=( "--enable-debug" )
use python && myconf+=( "--enable-python=3" )
use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" )
