| 1 |
commit: 80ceb49a9fca18a91c44ebbcf67774ff9b6648e0 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 29 22:32:30 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=80ceb49a |
| 7 |
|
| 8 |
sys-cluster/sionlib: merge patches |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
.../files/sionlib-build-shared-libraries.patch | 46 ++++++++++++++----- |
| 13 |
.../sionlib/files/sionlib-fix-linking.patch | 52 ---------------------- |
| 14 |
sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild | 1 - |
| 15 |
3 files changed, 35 insertions(+), 64 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch |
| 18 |
index 30e6cd32e..6d5c69f48 100644 |
| 19 |
--- a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch |
| 20 |
+++ b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch |
| 21 |
@@ -111,9 +111,16 @@ |
| 22 |
# Dependencies |
| 23 |
--- a/src/lib/Makefile |
| 24 |
+++ b/src/lib/Makefile |
| 25 |
-@@ -67,25 +67,25 @@ |
| 26 |
+@@ -66,26 +66,32 @@ |
| 27 |
+ SION_CXX_HDR = sion_cxx.h |
| 28 |
endif |
| 29 |
|
| 30 |
++ifneq ($(PTHREADSUPPORT),"no") |
| 31 |
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_PTHREADS) |
| 32 |
++else |
| 33 |
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_NONE) |
| 34 |
++endif |
| 35 |
++ |
| 36 |
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) |
| 37 |
-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 |
| 38 |
+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 |
| 39 |
@@ -124,8 +131,8 @@ |
| 40 |
|
| 41 |
-lib$(SION_LIBNAME_COM).a : $(SION_COMMON_OBJS) |
| 42 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_COMMON_OBJS) |
| 43 |
-+lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) |
| 44 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@ $(SION_COMMON_OBJS) |
| 45 |
++lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) lib$(LOCKLIB).so |
| 46 |
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@ $(SION_COMMON_OBJS) $(SIONFWD_LIBS) -L. -l$(LOCKLIB) |
| 47 |
@echo "*** $@ built" |
| 48 |
|
| 49 |
-lib$(SION_LIBNAME_COM_LOCK_PTHREADS).a : $(SION_COMMON_LOCK_PTHREADS_OBJS) |
| 50 |
@@ -147,7 +154,7 @@ |
| 51 |
@echo "*** $@ built" |
| 52 |
|
| 53 |
sion_lock_pthreads.o: sion_lock.c |
| 54 |
-@@ -178,7 +178,7 @@ |
| 55 |
+@@ -178,7 +184,7 @@ |
| 56 |
done |
| 57 |
|
| 58 |
clean: |
| 59 |
@@ -212,25 +219,25 @@ |
| 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) ../lib/lib$(SION_LIBNAME_COM).so |
| 63 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) |
| 64 |
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) -L../lib -l$(SION_LIBNAME_COM) |
| 65 |
@echo "*** $@ built" |
| 66 |
|
| 67 |
-lib$(SION_LIBNAME_OMP).a : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) |
| 68 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) |
| 69 |
-+lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 70 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) $(OMPFLAG) |
| 71 |
++lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 72 |
++ $(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) |
| 73 |
@echo "*** $@ built" |
| 74 |
|
| 75 |
-lib$(SION_LIBNAME_MPI).a : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) |
| 76 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) |
| 77 |
-+lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 78 |
-+ $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) |
| 79 |
++lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 80 |
++ $(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) |
| 81 |
@echo "*** $@ built" |
| 82 |
|
| 83 |
-lib$(SION_LIBNAME_OMPI).a : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) |
| 84 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) |
| 85 |
-+lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 86 |
-+ $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) $(HYBFLAG) |
| 87 |
++lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 88 |
++ $(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) |
| 89 |
@echo "*** $@ built" |
| 90 |
|
| 91 |
sion_generic.o : sion_generic.c |
| 92 |
@@ -245,6 +252,23 @@ |
| 93 |
# Dependencies |
| 94 |
--- a/src/parutils/Makefile |
| 95 |
+++ b/src/parutils/Makefile |
| 96 |
+@@ -30,12 +30,12 @@ |
| 97 |
+ COMPFLAGS = $(OMPMFLAG) $(OMPFLAG) |
| 98 |
+ CHYBFLAGS = $(HYBMFLAG) $(HYBFLAG) |
| 99 |
+ |
| 100 |
+-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) |
| 101 |
++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) |
| 102 |
+ |
| 103 |
+-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) |
| 104 |
+-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) |
| 105 |
++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) |
| 106 |
++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) |
| 107 |
+ |
| 108 |
+-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) |
| 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) $(HINTSLIB) $(CACHELIB) $(CUDA_LIBRARY_PATHS) $(CUDA_LIBRARIES) $(SIONFWD_LIBS) $(IMELIB_LIBPATH) $(IMELIB_LIB) |
| 110 |
+ FOMPLDFLAGS = $(COMPLDFLAGS) $(OMPFLAG) |
| 111 |
+ FHYBLDFLAGS = $(COMPILDFLAGS) $(OMPFLAG) |
| 112 |
+ |
| 113 |
@@ -55,6 +55,13 @@ |
| 114 |
ifeq ($(FORTRANENABLE),1) |
| 115 |
ifeq ($(MPIENABLE),1) |
| 116 |
|
| 117 |
diff --git a/sys-cluster/sionlib/files/sionlib-fix-linking.patch b/sys-cluster/sionlib/files/sionlib-fix-linking.patch |
| 118 |
deleted file mode 100644 |
| 119 |
index 7148eff31..000000000 |
| 120 |
--- a/sys-cluster/sionlib/files/sionlib-fix-linking.patch |
| 121 |
+++ /dev/null |
| 122 |
@@ -1,52 +0,0 @@ |
| 123 |
-diff '--color=auto' -ru sionlib-ori/src/lib/Makefile sionlib/src/lib/Makefile |
| 124 |
---- sionlib-ori/src/lib/Makefile 2021-08-29 08:14:05.901799434 +0200 |
| 125 |
-+++ sionlib/src/lib/Makefile 2021-08-29 16:49:25.241515611 +0200 |
| 126 |
-@@ -66,14 +66,20 @@ |
| 127 |
- SION_CXX_HDR = sion_cxx.h |
| 128 |
- endif |
| 129 |
- |
| 130 |
-+ifeq ($(PTHREADSUPPORT),"yes") |
| 131 |
-+LOCKLIB = $(SION_LIBNAME_COM_LOCK_PTHREADS) |
| 132 |
-+else |
| 133 |
-+LOCKLIB = $(SION_LIBNAME_COM_LOCK_NONE) |
| 134 |
-+endif |
| 135 |
-+ |
| 136 |
- 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) |
| 137 |
- 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 |
| 138 |
- |
| 139 |
- |
| 140 |
- 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 |
| 141 |
- |
| 142 |
--lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) |
| 143 |
-- $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@ $(SION_COMMON_OBJS) |
| 144 |
-+lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) lib$(LOCKLIB).so |
| 145 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@ $(SION_COMMON_OBJS) $(SIONFWD_LIBS) -l$(LOCKLIB) |
| 146 |
- @echo "*** $@ built" |
| 147 |
- |
| 148 |
- lib$(SION_LIBNAME_COM_LOCK_PTHREADS).so : $(SION_COMMON_LOCK_PTHREADS_OBJS) |
| 149 |
-diff '--color=auto' -ru sionlib-ori/src/parlib/Makefile sionlib/src/parlib/Makefile |
| 150 |
---- sionlib-ori/src/parlib/Makefile 2021-08-29 08:14:05.888799373 +0200 |
| 151 |
-+++ sionlib/src/parlib/Makefile 2021-08-29 17:21:42.262938785 +0200 |
| 152 |
-@@ -93,16 +93,16 @@ |
| 153 |
- $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) |
| 154 |
- @echo "*** $@ built" |
| 155 |
- |
| 156 |
--lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 157 |
-- $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) $(OMPFLAG) |
| 158 |
-+lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 159 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) -l$(SION_LIBNAME_GEN) $(OMPFLAG) |
| 160 |
- @echo "*** $@ built" |
| 161 |
- |
| 162 |
--lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 163 |
-- $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) |
| 164 |
-+lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 165 |
-+ $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) -l$(SION_LIBNAME_GEN) |
| 166 |
- @echo "*** $@ built" |
| 167 |
- |
| 168 |
--lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 169 |
-- $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) $(HYBFLAG) |
| 170 |
-+lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 171 |
-+ $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) -l$(SION_LIBNAME_GEN) $(HYBFLAG) |
| 172 |
- @echo "*** $@ built" |
| 173 |
- |
| 174 |
- sion_generic.o : sion_generic.c |
| 175 |
|
| 176 |
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild |
| 177 |
index 76df6efc6..3cc5f940f 100644 |
| 178 |
--- a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild |
| 179 |
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild |
| 180 |
@@ -38,7 +38,6 @@ REQUIRED_USE="?? ( hostname-regex deep-est-sdv )" |
| 181 |
PATCHES=( |
| 182 |
"${FILESDIR}/${PN}-respect-flags-v3.patch" |
| 183 |
"${FILESDIR}/${PN}-build-shared-libraries.patch" |
| 184 |
- "${FILESDIR}/${PN}-fix-linking.patch" |
| 185 |
) |
| 186 |
|
| 187 |
pkg_setup() { |
Archives