diff options
| author |   Alessandro Barbieri <lssndrbarbieri@gmail.com> | 2021-08-30 01:13:13 +0200 |
|---|---|---|
| committer | Alessandro Barbieri <lssndrbarbieri@gmail.com> | 2021-08-30 01:13:13 +0200 |
| commit | e79ca7867a7db7b1026a116a67347d69b62f4607 (patch) | |
| tree | bf4405016fd04a170adc26d2ab1c5399229d0447 | |
| parent | sys-cluster/sionlib: merge patches (diff) | |
| download | guru-e79ca786.tar.gz guru-e79ca786.tar.bz2 guru-e79ca786.zip | |
sys-cluster/sionlibl: reorder library link
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
| -rw-r--r-- | sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch index 357fd7a88..b48e7ea64 100644 --- a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch +++ b/sys-cluster/sionlibl/files/sionlibl-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: |