| 1 |
commit: 9eae29ade42e8dbbab389b3b19543d793363e202 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 29 15:39:40 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=9eae29ad |
| 7 |
|
| 8 |
sys-cluster/sionlib: fix linking issues |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
.../files/sionlib-build-shared-libraries.patch | 16 +++---- |
| 13 |
.../sionlib/files/sionlib-fix-linking.patch | 52 ++++++++++++++++++++++ |
| 14 |
...lib-1.7.7-r3.ebuild => sionlib-1.7.7-r4.ebuild} | 7 ++- |
| 15 |
3 files changed, 65 insertions(+), 10 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 2f41d58c1..30e6cd32e 100644 |
| 19 |
--- a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch |
| 20 |
+++ b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch |
| 21 |
@@ -211,26 +211,26 @@ |
| 22 |
|
| 23 |
-lib$(SION_LIBNAME_GEN).a : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) |
| 24 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) |
| 25 |
-+lib$(SION_LIBNAME_GEN).so : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) |
| 26 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) |
| 27 |
++lib$(SION_LIBNAME_GEN).so : $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 28 |
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) |
| 29 |
@echo "*** $@ built" |
| 30 |
|
| 31 |
-lib$(SION_LIBNAME_OMP).a : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) |
| 32 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) |
| 33 |
-+lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) |
| 34 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) $(OMPFLAG) |
| 35 |
++lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 36 |
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) $(OMPFLAG) |
| 37 |
@echo "*** $@ built" |
| 38 |
|
| 39 |
-lib$(SION_LIBNAME_MPI).a : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) |
| 40 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) |
| 41 |
-+lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) |
| 42 |
-+ $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) |
| 43 |
++lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 44 |
++ $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) |
| 45 |
@echo "*** $@ built" |
| 46 |
|
| 47 |
-lib$(SION_LIBNAME_OMPI).a : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) |
| 48 |
- $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) |
| 49 |
-+lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) |
| 50 |
-+ $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) $(HYBFLAG) |
| 51 |
++lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 52 |
++ $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) $(HYBFLAG) |
| 53 |
@echo "*** $@ built" |
| 54 |
|
| 55 |
sion_generic.o : sion_generic.c |
| 56 |
|
| 57 |
diff --git a/sys-cluster/sionlib/files/sionlib-fix-linking.patch b/sys-cluster/sionlib/files/sionlib-fix-linking.patch |
| 58 |
new file mode 100644 |
| 59 |
index 000000000..7148eff31 |
| 60 |
--- /dev/null |
| 61 |
+++ b/sys-cluster/sionlib/files/sionlib-fix-linking.patch |
| 62 |
@@ -0,0 +1,52 @@ |
| 63 |
+diff '--color=auto' -ru sionlib-ori/src/lib/Makefile sionlib/src/lib/Makefile |
| 64 |
+--- sionlib-ori/src/lib/Makefile 2021-08-29 08:14:05.901799434 +0200 |
| 65 |
++++ sionlib/src/lib/Makefile 2021-08-29 16:49:25.241515611 +0200 |
| 66 |
+@@ -66,14 +66,20 @@ |
| 67 |
+ SION_CXX_HDR = sion_cxx.h |
| 68 |
+ endif |
| 69 |
+ |
| 70 |
++ifeq ($(PTHREADSUPPORT),"yes") |
| 71 |
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_PTHREADS) |
| 72 |
++else |
| 73 |
++LOCKLIB = $(SION_LIBNAME_COM_LOCK_NONE) |
| 74 |
++endif |
| 75 |
++ |
| 76 |
+ 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) |
| 77 |
+ 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 |
| 78 |
+ |
| 79 |
+ |
| 80 |
+ 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 |
| 81 |
+ |
| 82 |
+-lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) |
| 83 |
+- $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@ $(SION_COMMON_OBJS) |
| 84 |
++lib$(SION_LIBNAME_COM).so : $(SION_COMMON_OBJS) lib$(LOCKLIB).so |
| 85 |
++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_COM).so -shared -o $@ $(SION_COMMON_OBJS) $(SIONFWD_LIBS) -l$(LOCKLIB) |
| 86 |
+ @echo "*** $@ built" |
| 87 |
+ |
| 88 |
+ lib$(SION_LIBNAME_COM_LOCK_PTHREADS).so : $(SION_COMMON_LOCK_PTHREADS_OBJS) |
| 89 |
+diff '--color=auto' -ru sionlib-ori/src/parlib/Makefile sionlib/src/parlib/Makefile |
| 90 |
+--- sionlib-ori/src/parlib/Makefile 2021-08-29 08:14:05.888799373 +0200 |
| 91 |
++++ sionlib/src/parlib/Makefile 2021-08-29 17:21:42.262938785 +0200 |
| 92 |
+@@ -93,16 +93,16 @@ |
| 93 |
+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_GEN).so -shared -o $@ $(SION_OBJS_GEN) $(SION_OBJS_INTERNAL) $(LOCKLINK) |
| 94 |
+ @echo "*** $@ built" |
| 95 |
+ |
| 96 |
+-lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 97 |
+- $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) $(OMPFLAG) |
| 98 |
++lib$(SION_LIBNAME_OMP).so : $(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 99 |
++ $(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) |
| 100 |
+ @echo "*** $@ built" |
| 101 |
+ |
| 102 |
+-lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 103 |
+- $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) |
| 104 |
++lib$(SION_LIBNAME_MPI).so : $(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 105 |
++ $(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) |
| 106 |
+ @echo "*** $@ built" |
| 107 |
+ |
| 108 |
+-lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so |
| 109 |
+- $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o $@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) $(HYBFLAG) |
| 110 |
++lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) ../lib/lib$(SION_LIBNAME_COM).so lib$(SION_LIBNAME_GEN).so |
| 111 |
++ $(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) |
| 112 |
+ @echo "*** $@ built" |
| 113 |
+ |
| 114 |
+ sion_generic.o : sion_generic.c |
| 115 |
|
| 116 |
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r3.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild |
| 117 |
similarity index 96% |
| 118 |
rename from sys-cluster/sionlib/sionlib-1.7.7-r3.ebuild |
| 119 |
rename to sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild |
| 120 |
index 9fbf33425..76df6efc6 100644 |
| 121 |
--- a/sys-cluster/sionlib/sionlib-1.7.7-r3.ebuild |
| 122 |
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild |
| 123 |
@@ -38,6 +38,7 @@ REQUIRED_USE="?? ( hostname-regex deep-est-sdv )" |
| 124 |
PATCHES=( |
| 125 |
"${FILESDIR}/${PN}-respect-flags-v3.patch" |
| 126 |
"${FILESDIR}/${PN}-build-shared-libraries.patch" |
| 127 |
+ "${FILESDIR}/${PN}-fix-linking.patch" |
| 128 |
) |
| 129 |
|
| 130 |
pkg_setup() { |
| 131 |
@@ -65,9 +66,13 @@ src_configure() { |
| 132 |
use hostname-regex && msa="hostname-regex" |
| 133 |
|
| 134 |
local myconf=( |
| 135 |
+ --disable-gcovr |
| 136 |
+ --disable-kcov |
| 137 |
--disable-mic |
| 138 |
--msa="${msa}" |
| 139 |
--prefix="${T}/prefix/usr" |
| 140 |
+ $(use_enable debug) |
| 141 |
+ $(use_enable pthreads) |
| 142 |
) |
| 143 |
|
| 144 |
#custom configure? |
| 145 |
@@ -77,9 +82,7 @@ src_configure() { |
| 146 |
use ompi || myconf+=( "--disable-ompi" ) |
| 147 |
use openmp || myconf+=( "--disable-omp" ) |
| 148 |
use parutils || myconf+=( "--disable-parutils" ) |
| 149 |
- use pthreads || myconf+=( "--disable-pthreads" ) |
| 150 |
|
| 151 |
- use debug && myconf+=( "--enable-debug" ) |
| 152 |
use python && myconf+=( "--enable-python=3" ) |
| 153 |
use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" ) |
Archives