* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/files/
@ 2021-08-29 0:33 Alessandro Barbieri
0 siblings, 0 replies; 3+ messages in thread
From: Alessandro Barbieri @ 2021-08-29 0:33 UTC (permalink / raw
To: gentoo-commits
commit: 45360dcfcc0b88484a72fc357a78c7c159f105d1
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Aug 29 00:32:41 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Aug 29 00:33:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=45360dcf
sys-cluster/sionlib: fix library linking
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../files/sionlib-build-shared-libraries.patch | 66 +++++++++++++---------
1 file changed, 38 insertions(+), 28 deletions(-)
diff --git a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
index 9c1895499..2f41d58c1 100644
--- a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
+++ b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
@@ -1,6 +1,5 @@
-diff '--color=auto' -ru sionlib-ori/src/cppinterface/Makefile sionlib/src/cppinterface/Makefile
---- sionlib-ori/src/cppinterface/Makefile 2021-08-29 01:04:54.919546800 +0200
-+++ sionlib/src/cppinterface/Makefile 2021-08-29 00:44:20.564541936 +0200
+--- a/src/cppinterface/Makefile
++++ b/src/cppinterface/Makefile
@@ -30,7 +30,7 @@
ifeq ($(CXXENABLE),1)
@@ -36,9 +35,8 @@ diff '--color=auto' -ru sionlib-ori/src/cppinterface/Makefile sionlib/src/cppint
#------------------------------------------------------------------------------
# Dependencies
-diff '--color=auto' -ru sionlib-ori/src/fortraninterface/Makefile sionlib/src/fortraninterface/Makefile
---- sionlib-ori/src/fortraninterface/Makefile 2021-08-29 01:04:54.928546844 +0200
-+++ sionlib/src/fortraninterface/Makefile 2021-08-29 01:21:47.153471098 +0200
+--- a/src/fortraninterface/Makefile
++++ b/src/fortraninterface/Makefile
@@ -39,7 +39,7 @@
USER_HDRS = sion_f77.H sion_f77.h
@@ -52,24 +50,24 @@ diff '--color=auto' -ru sionlib-ori/src/fortraninterface/Makefile sionlib/src/fo
SION_OBJS_F77_SER += sion_f77_omp.o sion_fortran_omp.o
SION_OBJS_F90_SER += sion_f90_omp.o sion_fortran_omp.o
USER_MODS += sion_f90_omp.mod
-+ F77_SER_LIBS = $(OMPFLAG) -l$(SION_LIBNAME_OMP)
-+ F90_SER_LIBS = $(OMPFLAG) -l$(SION_LIBNAME_OMP)
++ F77_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP)
++ F90_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP)
endif
ifeq ($(MPIENABLE),1)
SION_OBJS_F77_MPI += sion_f77_mpi.o sion_fortran_mpi.o sion_fortran_writeread_mpi_f77.o
SION_OBJS_F90_MPI += sion_f90_mpi.o sion_fortran_mpi.o sion_fortran_writeread_mpi_f90.o
USER_MODS += sion_f90_mpi.mod
-+ F77_MPI_LIBS = -l$(SION_LIBNAME_MPI)
-+ F90_MPI_LIBS = -l$(SION_LIBNAME_MPI)
++ F77_MPI_LIBS = -L../parlib -l$(SION_LIBNAME_MPI)
++ F90_MPI_LIBS = -L../parlib -l$(SION_LIBNAME_MPI)
endif
ifeq ($(HYBENABLE),1)
SION_OBJS_F77_MPI += sion_f77_ompi.o sion_fortran_ompi.o
SION_OBJS_F90_MPI += sion_f90_ompi.o sion_fortran_ompi.o
USER_MODS += sion_f90_ompi.mod
-+ F77_MPI_LIBS = $(HYBFLAG) -l$(SION_LIBNAME_OMPI)
-+ F90_MPI_LIBS = $(HYBFLAG) -l$(SION_LIBNAME_OMPI)
++ F77_MPI_LIBS = $(HYBFLAG) -L../parlib -l$(SION_LIBNAME_OMPI)
++ F90_MPI_LIBS = $(HYBFLAG) -L../parlib -l$(SION_LIBNAME_OMPI)
endif
SION_DEPEND_OBJS=sion_fortran.o sion_fortran_omp.o sion_fortran_mpi.o sion_fortran_ompi.o sion_fortran_writeread_f77.o sion_fortran_writeread_f90.o sion_fortran_writeread_mpi_f77.o sion_fortran_writeread_mpi_f90.o
@@ -111,9 +109,8 @@ diff '--color=auto' -ru sionlib-ori/src/fortraninterface/Makefile sionlib/src/fo
#------------------------------------------------------------------------------
# Dependencies
-diff '--color=auto' -ru sionlib-ori/src/lib/Makefile sionlib/src/lib/Makefile
---- sionlib-ori/src/lib/Makefile 2021-08-29 01:04:54.930546854 +0200
-+++ sionlib/src/lib/Makefile 2021-08-29 00:44:20.574541984 +0200
+--- a/src/lib/Makefile
++++ b/src/lib/Makefile
@@ -67,25 +67,25 @@
endif
@@ -159,9 +156,8 @@ diff '--color=auto' -ru sionlib-ori/src/lib/Makefile sionlib/src/lib/Makefile
#------------------------------------------------------------------------------
# Dependencies
-diff '--color=auto' -ru sionlib-ori/src/parlib/Makefile sionlib/src/parlib/Makefile
---- sionlib-ori/src/parlib/Makefile 2021-08-29 01:04:54.921546810 +0200
-+++ sionlib/src/parlib/Makefile 2021-08-29 01:03:58.041270101 +0200
+--- a/src/parlib/Makefile
++++ b/src/parlib/Makefile
@@ -29,7 +29,7 @@
.SUFFIXES: .cpp .c .f
@@ -247,10 +243,23 @@ diff '--color=auto' -ru sionlib-ori/src/parlib/Makefile sionlib/src/parlib/Makef
#------------------------------------------------------------------------------
# Dependencies
-diff '--color=auto' -ru sionlib-ori/src/parutils/Makefile sionlib/src/parutils/Makefile
---- sionlib-ori/src/parutils/Makefile 2021-08-29 01:04:54.928546844 +0200
-+++ sionlib/src/parutils/Makefile 2021-08-29 00:44:20.571541969 +0200
-@@ -75,10 +75,10 @@
+--- a/src/parutils/Makefile
++++ b/src/parutils/Makefile
+@@ -55,6 +55,13 @@
+ ifeq ($(FORTRANENABLE),1)
+ ifeq ($(MPIENABLE),1)
+ USER_UTILS += fpartest
++ F77_MPI_LIBS = -L../parlib -l$(SION_LIBNAME_MPI)
++ endif
++ ifeq ($(OMPENABLE),1)
++ F77_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP)
++ endif
++ ifeq ($(HYBENABLE),1)
++ F77_MPI_LIBS = $(HYBFLAG) -L../parlib -l$(SION_LIBNAME_OMPI)
+ endif
+ endif
+
+@@ -75,10 +82,10 @@
all: $(USER_UTILS)
@@ -263,16 +272,18 @@ diff '--color=auto' -ru sionlib-ori/src/parutils/Makefile sionlib/src/parutils/M
$(HYBCC) -o $@ $(PARTEST_OMPI_OBJS) $(CHYBLDFLAGS) -L../parlib -l$(SION_LIBNAME_OMP) -L../lib -l$(SION_LIBNAME_SER) $(MPILIB)
ompi_partest.o : ompi_partest.c
-@@ -114,7 +114,7 @@
+@@ -114,8 +121,8 @@
fpartest.o : fpartest.F90
$(MPIF90) $(FFLAGS) -c fpartest.F90
-fpartest: fpartest.o ../parlib/lib$(SION_LIBNAME_MPI).a ../parlib/lib$(SION_LIBNAME_GEN).a ../lib/lib$(SION_LIBNAME_SER).a ../fortraninterface/lib$(SION_LIBNAME_F77_MPI).a ../fortraninterface/lib$(SION_LIBNAME_F77_SER).a
+- $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB)
+fpartest: fpartest.o ../parlib/lib$(SION_LIBNAME_MPI).so ../parlib/lib$(SION_LIBNAME_GEN).so ../lib/lib$(SION_LIBNAME_SER).so ../fortraninterface/lib$(SION_LIBNAME_F77_MPI).so ../fortraninterface/lib$(SION_LIBNAME_F77_SER).so
- $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB)
++ $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB) $(F77_MPI_LIBS) $(F77_SER_LIBS)
-@@ -161,7 +161,7 @@
+ install: all
+@@ -161,7 +168,7 @@
@rm -f header.tmp
clean:
@@ -281,9 +292,8 @@ diff '--color=auto' -ru sionlib-ori/src/parutils/Makefile sionlib/src/parutils/M
#------------------------------------------------------------------------------
# Dependencies
-diff '--color=auto' -ru sionlib-ori/src/utils/Makefile sionlib/src/utils/Makefile
---- sionlib-ori/src/utils/Makefile 2021-08-29 01:04:54.925546830 +0200
-+++ sionlib/src/utils/Makefile 2021-08-29 00:44:20.568541955 +0200
+--- a/src/utils/Makefile
++++ b/src/utils/Makefile
@@ -45,32 +45,32 @@
siondump.o : siondump.c
$(CC) $(CFLAGS) -c siondump.c
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/files/
@ 2021-08-29 23:16 Alessandro Barbieri
0 siblings, 0 replies; 3+ messages in thread
From: Alessandro Barbieri @ 2021-08-29 23:16 UTC (permalink / raw
To: gentoo-commits
commit: a14419ec41f6ed065fe21a13787982c22230d6a9
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Aug 29 23:15:30 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Aug 29 23:15:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a14419ec
sys-cluster/sionlib: reorder lib link
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../files/sionlib-build-shared-libraries.patch | 26 +++++++++++++---------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
index 6d5c69f48..c1e1c0181 100644
--- a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
+++ b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
@@ -252,24 +252,30 @@
# Dependencies
--- a/src/parutils/Makefile
+++ b/src/parutils/Makefile
-@@ -30,12 +30,12 @@
+@@ -30,12 +30,18 @@
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)
-
++ifneq ($(PTHREADSUPPORT),"no")
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_PTHREADS)
++else
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_NONE)
++endif
++
++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)
+
-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)
++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)
++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)
-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)
++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)
FOMPLDFLAGS = $(COMPLDFLAGS) $(OMPFLAG)
FHYBLDFLAGS = $(COMPILDFLAGS) $(OMPFLAG)
-@@ -55,6 +55,13 @@
+@@ -55,6 +61,13 @@
ifeq ($(FORTRANENABLE),1)
ifeq ($(MPIENABLE),1)
USER_UTILS += fpartest
@@ -283,7 +289,7 @@
endif
endif
-@@ -75,10 +82,10 @@
+@@ -75,10 +88,10 @@
all: $(USER_UTILS)
@@ -296,7 +302,7 @@
$(HYBCC) -o $@ $(PARTEST_OMPI_OBJS) $(CHYBLDFLAGS) -L../parlib -l$(SION_LIBNAME_OMP) -L../lib -l$(SION_LIBNAME_SER) $(MPILIB)
ompi_partest.o : ompi_partest.c
-@@ -114,8 +121,8 @@
+@@ -114,8 +127,8 @@
fpartest.o : fpartest.F90
$(MPIF90) $(FFLAGS) -c fpartest.F90
@@ -307,7 +313,7 @@
install: all
-@@ -161,7 +168,7 @@
+@@ -161,7 +174,7 @@
@rm -f header.tmp
clean:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/files/
@ 2021-10-15 21:41 Alessandro Barbieri
0 siblings, 0 replies; 3+ messages in thread
From: Alessandro Barbieri @ 2021-10-15 21:41 UTC (permalink / raw
To: gentoo-commits
commit: d99c7de558a9e6cfdf97435955fcf96ac1509e8c
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Fri Oct 15 21:16:28 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Fri Oct 15 21:41:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d99c7de5
sys-cluster/sionlib: fix linking between libraries
Closes: https://bugs.gentoo.org/817845
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../files/sionlib-build-shared-libraries.patch | 68 ++++++++++++----------
1 file changed, 38 insertions(+), 30 deletions(-)
diff --git a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
index c1e1c0181..178707fc4 100644
--- a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
+++ b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
@@ -9,14 +9,17 @@
else
USER_HDRS =
USER_LIBS =
-@@ -58,12 +58,12 @@
+@@ -57,13 +57,15 @@
+
all: $(USER_LIBS)
++../lib/lib$(SION_LIBNAME_SER).so :
++ make -C ../lib lib$(SION_LIBNAME_SER).so
-lib$(SION_LIBNAME_CXX_SER).a : $(SION_OBJS_SER)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_SER)
-+lib$(SION_LIBNAME_CXX_SER).so : $(SION_OBJS_SER)
-+ $(CXX) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_CXX_SER).so -shared -o $@ $(SION_OBJS_SER)
++lib$(SION_LIBNAME_CXX_SER).so : $(SION_OBJS_SER) ../lib/lib$(SION_LIBNAME_SER).so
++ $(CXX) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_CXX_SER).so -shared -o $@ $(SION_OBJS_SER) -L../lib -l$(SION_LIBNAME_SER)
@echo "*** $@ built"
-lib$(SION_LIBNAME_CXX_MPI).a : $(SION_OBJS_MPI)
@@ -26,7 +29,7 @@
@echo "*** $@ built"
sion_cxx_base.o :
-@@ -118,7 +118,7 @@
+@@ -118,7 +120,7 @@
done
clean:
@@ -46,12 +49,12 @@
else
USER_HDRS =
USER_MODS =
-@@ -56,18 +56,24 @@
+@@ -56,39 +56,47 @@
SION_OBJS_F77_SER += sion_f77_omp.o sion_fortran_omp.o
SION_OBJS_F90_SER += sion_f90_omp.o sion_fortran_omp.o
USER_MODS += sion_f90_omp.mod
-+ F77_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP)
-+ F90_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP)
++ F77_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP) -L../lib -l$(SION_LIBNAME_GEN)
++ F90_SER_LIBS = $(OMPFLAG) -L../parlib -l$(SION_LIBNAME_OMP) -L../lib -l$(SION_LIBNAME_GEN)
endif
ifeq ($(MPIENABLE),1)
@@ -71,13 +74,15 @@
endif
SION_DEPEND_OBJS=sion_fortran.o sion_fortran_omp.o sion_fortran_mpi.o sion_fortran_ompi.o sion_fortran_writeread_f77.o sion_fortran_writeread_f90.o sion_fortran_writeread_mpi_f77.o sion_fortran_writeread_mpi_f90.o
-@@ -75,20 +81,20 @@
+
all: $(USER_LIBS) $(USER_MODS)
++../lib/lib$(SION_LIBNAME_SER).so :
++ make -C ../lib lib$(SION_LIBNAME_SER).so
-lib$(SION_LIBNAME_F77_SER).a : $(SION_OBJS_F77_SER)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_F77_SER)
-+lib$(SION_LIBNAME_F77_SER).so : $(SION_OBJS_F77_SER)
++lib$(SION_LIBNAME_F77_SER).so : $(SION_OBJS_F77_SER) ../lib/lib$(SION_LIBNAME_SER).so
+ $(F77) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_F77_SER).so -shared -o $@ $(SION_OBJS_F77_SER) $(F77_SER_LIBS)
@echo "*** $@ built"
@@ -89,7 +94,7 @@
-lib$(SION_LIBNAME_F90_SER).a : $(SION_OBJS_F90_SER)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_F90_SER)
-+lib$(SION_LIBNAME_F90_SER).so : $(SION_OBJS_F90_SER)
++lib$(SION_LIBNAME_F90_SER).so : $(SION_OBJS_F90_SER) ../lib/lib$(SION_LIBNAME_SER).so
+ $(F90) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_F90_SER).so -shared -o $@ $(SION_OBJS_F90_SER) $(F90_SER_LIBS)
@echo "*** $@ built"
@@ -100,7 +105,7 @@
@echo "*** $@ built"
# F77 interface
-@@ -206,7 +212,7 @@
+@@ -206,7 +214,7 @@
done
clean:
@@ -111,23 +116,23 @@
# Dependencies
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
-@@ -66,26 +66,32 @@
+@@ -66,26 +66,31 @@
SION_CXX_HDR = sion_cxx.h
endif
+-USER_HDRS = sion.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
+ifneq ($(PTHREADSUPPORT),"no")
+LOCKLIB = $(SION_LIBNAME_COM_LOCK_PTHREADS)
+else
+LOCKLIB = $(SION_LIBNAME_COM_LOCK_NONE)
+endif
-+
- USER_HDRS = sion.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
++USER_HDRS = sion.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).so lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_COM_LOCK_PTHREADS).so lib$(SION_LIBNAME_COM_LOCK_NONE).so
-all: lib$(SION_LIBNAME_COM).a lib$(SION_LIBNAME_SER).a lib$(SION_LIBNAME_COM_LOCK_PTHREADS).a lib$(SION_LIBNAME_COM_LOCK_NONE).a
-+all: lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_SER).so lib$(SION_LIBNAME_COM_LOCK_PTHREADS).so lib$(SION_LIBNAME_COM_LOCK_NONE).so
++all: lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_SER).so lib$(SION_LIBNAME_COM_LOCK_PTHREADS).so lib$(SION_LIBNAME_COM_LOCK_NONE).so
-lib$(SION_LIBNAME_COM).a : $(SION_COMMON_OBJS)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_COMMON_OBJS)
@@ -149,12 +154,12 @@
-lib$(SION_LIBNAME_SER).a : $(SION_SER_OBJS)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_SER_OBJS)
-+lib$(SION_LIBNAME_SER).so : $(SION_SER_OBJS)
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_SER).so -shared -o $@ $(SION_SER_OBJS)
++lib$(SION_LIBNAME_SER).so : $(SION_SER_OBJS) lib$(SION_LIBNAME_COM).so
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_SER).so -shared -o $@ $(SION_SER_OBJS) -L. -l$(SION_LIBNAME_COM)
@echo "*** $@ built"
sion_lock_pthreads.o: sion_lock.c
-@@ -178,7 +184,7 @@
+@@ -178,7 +183,7 @@
done
clean:
@@ -212,12 +217,15 @@
else
LOCKCC =$(CC)
LOCKCFLAGS=$(CFLAGS)
-@@ -87,20 +89,20 @@
+@@ -87,20 +89,23 @@
all: $(USER_LIBS)
-lib$(SION_LIBNAME_GEN).a : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL)
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL)
++../lib/lib$(SION_LIBNAME_COM).so :
++ make -C ../lib lib$(SION_LIBNAME_COM).so
++
+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"
@@ -241,7 +249,7 @@
@echo "*** $@ built"
sion_generic.o : sion_generic.c
-@@ -224,7 +226,7 @@
+@@ -224,7 +229,7 @@
done
clean:
@@ -294,7 +302,7 @@
all: $(USER_UTILS)
-partest: $(PARTEST_OBJS) ../parlib/lib$(SION_LIBNAME_MPI).a ../parlib/lib$(SION_LIBNAME_GEN).a ../lib/lib$(SION_LIBNAME_SER).a
-+partest: $(PARTEST_OBJS) ../parlib/lib$(SION_LIBNAME_MPI).so ../parlib/lib$(SION_LIBNAME_GEN).so ../lib/lib$(SION_LIBNAME_SER).so
++partest: $(PARTEST_OBJS) ../parlib/lib$(SION_LIBNAME_MPI).so ../parlib/lib$(SION_LIBNAME_GEN).so ../lib/lib$(SION_LIBNAME_SER).so
$(MPICC) -o $@ $(PARTEST_OBJS) -L../lib -l$(SION_LIBNAME_SER) $(CMPILDFLAGS) $(MPILIB)
-ompi_partest: $(PARTEST_OMPI_OBJS) ../parlib/lib$(SION_LIBNAME_OMPI).a ../parlib/lib$(SION_LIBNAME_OMP).a ../lib/lib$(SION_LIBNAME_SER).a
@@ -308,8 +316,8 @@
-fpartest: fpartest.o ../parlib/lib$(SION_LIBNAME_MPI).a ../parlib/lib$(SION_LIBNAME_GEN).a ../lib/lib$(SION_LIBNAME_SER).a ../fortraninterface/lib$(SION_LIBNAME_F77_MPI).a ../fortraninterface/lib$(SION_LIBNAME_F77_SER).a
- $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB)
-+fpartest: fpartest.o ../parlib/lib$(SION_LIBNAME_MPI).so ../parlib/lib$(SION_LIBNAME_GEN).so ../lib/lib$(SION_LIBNAME_SER).so ../fortraninterface/lib$(SION_LIBNAME_F77_MPI).so ../fortraninterface/lib$(SION_LIBNAME_F77_SER).so
-+ $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB) $(F77_MPI_LIBS) $(F77_SER_LIBS)
++fpartest: fpartest.o ../parlib/lib$(SION_LIBNAME_MPI).so ../parlib/lib$(SION_LIBNAME_GEN).so ../lib/lib$(SION_LIBNAME_SER).so ../fortraninterface/lib$(SION_LIBNAME_F77_MPI).so ../fortraninterface/lib$(SION_LIBNAME_F77_SER).so
++ $(MPIF90) -o $@ fpartest.o -L../fortraninterface -l$(SION_LIBNAME_F77_MPI) -l$(SION_LIBNAME_F77_SER) $(FMPILDFLAGS) $(MPILIB) $(F77_MPI_LIBS) $(F77_SER_LIBS)
install: all
@@ -345,24 +353,24 @@
$(CC) $(CFLAGS) -c sionversion.c
-siondump: siondump.o ../lib/lib$(SION_LIBNAME_SER).a ../lib/lib$(SION_LIBNAME_COM).a ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).a
-+siondump: siondump.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
++siondump: siondump.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
$(CC) -o $@ siondump.o $(LDFLAGS)
cp siondump $(TOPDIR)/..
-siondefrag: siondefrag.o ../lib/lib$(SION_LIBNAME_SER).a ../lib/lib$(SION_LIBNAME_COM).a ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).a
-+siondefrag: siondefrag.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
++siondefrag: siondefrag.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
$(CC) -o $@ siondefrag.o $(LDFLAGS)
-sionsplit: sionsplit.o ../lib/lib$(SION_LIBNAME_SER).a ../lib/lib$(SION_LIBNAME_COM).a ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).a
-+sionsplit: sionsplit.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
++sionsplit: sionsplit.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
$(CC) -o $@ sionsplit.o $(LDFLAGS)
-sioncat: sioncat.o ../lib/lib$(SION_LIBNAME_SER).a ../lib/lib$(SION_LIBNAME_COM).a ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).a
-+sioncat: sioncat.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
++sioncat: sioncat.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
$(CC) -o $@ sioncat.o $(LDFLAGS)
-sionversion: sionversion.o ../lib/lib$(SION_LIBNAME_SER).a ../lib/lib$(SION_LIBNAME_COM).a ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).a
-+sionversion: sionversion.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
++sionversion: sionversion.o ../lib/lib$(SION_LIBNAME_SER).so ../lib/lib$(SION_LIBNAME_COM).so ../lib/lib$(SION_LIBNAME_COM_LOCK_NONE).so
$(CC) -o $@ sionversion.o $(LDFLAGS)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-15 21:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-29 23:16 [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/files/ Alessandro Barbieri
-- strict thread matches above, loose matches on Subject: below --
2021-10-15 21:41 Alessandro Barbieri
2021-08-29 0:33 Alessandro Barbieri
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox