[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/

2022-06-09 Thread Alessandro Barbieri 
commit: e262c4b8190e7f405b7d9b83055eee7d38eeb2b7
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Jun  9 22:46:34 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Fri Jun 10 03:58:04 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e262c4b8

sys-cluster/sionlibl: fix mpich detection

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild | 40 +--
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild 
b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
index a8bae06a2..48de3e3ec 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
@@ -8,7 +8,7 @@ DOCS_CONFIG_NAME="doxy"
 FORTRAN_NEEDED="fortran"
 PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
-inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+inherit docs edo flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
 DESCRIPTION="Scalable I/O library for parallel access to task-local files"
 
HOMEPAGE="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html;
@@ -22,10 +22,6 @@ IUSE="+cxx debug deep-est-sdv doc examples +fortran 
hostname-regex +mpi +ompi +o
 
 RDEPEND="
mpi? ( virtual/mpi )
-   ompi? (
-   || ( sys-devel/gcc:*[openmp] sys-libs/libomp )
-   virtual/mpi
-   )
openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) )
sionfwd? ( sys-cluster/SIONfwd )
 "
@@ -34,7 +30,10 @@ DEPEND="
${PYTHON_DEPS}
 "
 
-REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
+REQUIRED_USE="
+   ompi? ( mpi openmp )
+   ?? ( hostname-regex deep-est-sdv )
+"
 PATCHES=(
"${FILESDIR}/${PN}-respect-flags-v3.patch"
"${FILESDIR}/${PN}-build-shared-libraries.patch"
@@ -43,7 +42,6 @@ PATCHES=(
 pkg_setup() {
FORTRAN_NEED_OPENMP=0
use openmp && FORTRAN_NEED_OPENMP=1
-   use ompi && FORTRAN_NEED_OPENMP=1
 
fortran-2_pkg_setup
 }
@@ -77,7 +75,11 @@ src_configure() {
#custom configure?
use cxx || myconf+=( "--disable-cxx" )
use fortran || myconf+=( "--disable-fortran" )
-   use mpi || myconf+=( "--disable-mpi" )
+   if use mpi; then
+   myconf+=( "--mpi=$(detect_mpi_implementation || die)" )
+   else
+   myconf+=( "--disable-mpi" )
+   fi
use ompi || myconf+=( "--disable-ompi" )
use openmp || myconf+=( "--disable-omp" )
use parutils || myconf+=( "--disable-parutils" )
@@ -85,7 +87,7 @@ src_configure() {
use python && myconf+=( "--enable-python=3" )
use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" )
 
-   ./configure "${myconf[@]}" || die
+   edo ./configure "${myconf[@]}"
 }
 
 src_compile() {
@@ -134,3 +136,23 @@ src_install() {
#find "${ED}" -name '*.a' -delete || die
find "${ED}" -name '*.la' -delete || die
 }
+
+detect_mpi_implementation() {
+   cat > testmpi.c <<- EOF
+#include "mpi.h"
+#include "stdio.h"
+
+int main(){
+   #ifdef OPEN_MPI
+   printf("%s","openmpi");
+   #endif
+
+   #ifdef MPICH
+   printf("%s%i","mpich",MPICH_NAME);
+   #endif
+   return 0;
+}
+EOF
+   edo ${CC} testmpi.c -o testmpi
+   ./testmpi || die
+}

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/

2022-05-28 Thread Alessandro Barbieri 
commit: fe837d0e4dc8ec9945cbd1205cc2fa762171962c
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sat May 28 12:45:52 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sat May 28 12:53:32 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fe837d0e

sys-cluster/sionlibl: enable py3.11

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild 
b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
index ed9809f65..a8bae06a2 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 DOCS_BUILDER="doxygen"
 DOCS_CONFIG_NAME="doxy"
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/files/

2021-10-15 Thread Alessandro Barbieri 
commit: b8c1775fae6e4daa676bfb7cb08f12cd2ef84c33
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Fri Oct 15 21:31:08 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Fri Oct 15 21:41:23 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b8c1775f

sys-cluster/sionlibl: fix linking between libraries

Closes: https://bugs.gentoo.org/817848
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 .../files/sionlibl-build-shared-libraries.patch| 68 --
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch 
b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch
index b48e7ea64..d40276d6e 100644
--- a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch
+++ b/sys-cluster/sionlibl/files/sionlibl-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_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 
 +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
  
++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)

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/files/

2021-08-29 Thread Alessandro Barbieri 
commit: e79ca7867a7db7b1026a116a67347d69b62f4607
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Aug 29 23:13:13 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Aug 29 23:13:13 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e79ca786

sys-cluster/sionlibl: reorder library link

Signed-off-by: Alessandro Barbieri  gmail.com>

 .../files/sionlibl-build-shared-libraries.patch| 26 +-
 1 file 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

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/, sys-cluster/sionlibl/files/

2021-08-29 Thread Alessandro Barbieri 
commit: 5dc0080ec40442263b23644e0d7d3050520c0a03
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Aug 29 22:28:32 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Aug 29 22:33:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5dc0080e

sys-cluster/sionlibl: fix other linking issues

Signed-off-by: Alessandro Barbieri  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)

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/files/, sys-cluster/sionlibl/

2021-08-28 Thread Alessandro Barbieri 
commit: 371e76ae0c75ed8bcac8cf20922e5983082fae16
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Aug 29 00:27:08 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Aug 29 00:33:33 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=371e76ae

sys-cluster/sionlibl: build shared libraries

Signed-off-by: Alessandro Barbieri  gmail.com>

 .../files/sionlibl-build-shared-libraries.patch| 347 +
 .../sionlibl/files/sionlibl-respect-flags-v3.patch |   6 +-
 ...bl-1.7.7-r1.ebuild => sionlibl-1.7.7-r2.ebuild} |   5 +-
 3 files changed, 354 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch 
b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch
new file mode 100644
index 0..ac0f5a39d
--- /dev/null
+++ b/sys-cluster/sionlibl/files/sionlibl-build-shared-libraries.patch
@@ -0,0 +1,347 @@
+--- a/src/cppinterface/Makefile
 b/src/cppinterface/Makefile
+@@ -30,7 +30,7 @@
+ ifeq ($(CXXENABLE),1)
+ 
+ USER_HDRS = sion_cxx_base.hpp sion_cxx_serial.hpp sion_cxx_common.hpp 
sion_cxx_mpi.hpp sion_cxx_ompi.hpp  sion_cxx_omp.hpp 
+-USER_LIBS = lib$(SION_LIBNAME_CXX_SER).a lib$(SION_LIBNAME_CXX_MPI).a
++USER_LIBS = lib$(SION_LIBNAME_CXX_SER).so lib$(SION_LIBNAME_CXX_MPI).so
+ else
+ USER_HDRS = 
+ USER_LIBS = 
+@@ -58,12 +58,12 @@
+ all: $(USER_LIBS)
+ 
+ 
+-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)
+   @echo "*** $@ built"
+ 
+-lib$(SION_LIBNAME_CXX_MPI).a : $(SION_OBJS_MPI)
+-  $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_MPI)
++lib$(SION_LIBNAME_CXX_MPI).so : $(SION_OBJS_MPI)
++  $(MPICXX) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_CXX_MPI).so -shared 
-o $@ $(SION_OBJS_MPI)
+   @echo "*** $@ built"
+ 
+ sion_cxx_base.o :
+@@ -118,7 +118,7 @@
+   done
+ 
+ clean:
+-  rm -f *.o lib*.a
++  rm -f *.o lib*.so
+ 
+ 
#--
+ # Dependencies
+--- a/src/fortraninterface/Makefile
 b/src/fortraninterface/Makefile
+@@ -39,7 +39,7 @@
+ 
+ USER_HDRS = sion_f77.H sion_f77.h 
+ USER_MODS = sion_f90.mod
+-USER_LIBS = lib$(SION_LIBNAME_F77_SER).a lib$(SION_LIBNAME_F77_MPI).a 
lib$(SION_LIBNAME_F90_SER).a lib$(SION_LIBNAME_F90_MPI).a
++USER_LIBS = lib$(SION_LIBNAME_F77_SER).so lib$(SION_LIBNAME_F77_MPI).so 
lib$(SION_LIBNAME_F90_SER).so lib$(SION_LIBNAME_F90_MPI).so
+ else
+ USER_HDRS = 
+ USER_MODS =
+@@ -56,18 +56,24 @@
+   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)
+ 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../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../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 
+@@ -75,20 +81,20 @@
+ all: $(USER_LIBS) $(USER_MODS)
+ 
+ 
+-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)
++  $(F77) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_F77_SER).so -shared -o 
$@ $(SION_OBJS_F77_SER) $(F77_SER_LIBS)
+   @echo "*** $@ built"
+ 
+-lib$(SION_LIBNAME_F77_MPI).a : $(SION_OBJS_F77_MPI)
+-  $(C_AR) $(AFLAG) -rcs $@ $(SION_OBJS_F77_MPI)
++lib$(SION_LIBNAME_F77_MPI).so : $(SION_OBJS_F77_MPI)
++  $(MPIF77) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_F77_MPI).so -shared 
-o $@ $(SION_OBJS_F77_MPI) $(F77_MPI_LIBS)
+   @echo "*** $@ built"
+ 
+-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)
++  $(F90) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_F90_SER).so -shared -o 
$@ $(SION_OBJS_F90_SER) $(F90_SER_LIBS)
+   @echo "*** $@ built"
+ 
+-lib$(SION_LIBNAME_F90_MPI).a : $(SION_OBJS_F90_MPI)
+-  $(C_AR) $(AFLAG) -rcs $@

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/, sys-cluster/sionlibl/files/

2021-08-28 Thread Alessandro Barbieri 
commit: af129baecbb72fbc346e5221ce45c2e9e6bba15d
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Fri Aug 27 00:58:08 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Aug 29 00:33:32 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=af129bae

sys-cluster/sionlibl: respect flags

Closes: https://bugs.gentoo.org/804837
Closes: https://bugs.gentoo.org/804849
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 ...gs-v2.patch => sionlibl-respect-flags-v3.patch} | 52 ++
 sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild  |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch 
b/sys-cluster/sionlibl/files/sionlibl-respect-flags-v3.patch
similarity index 73%
rename from sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
rename to sys-cluster/sionlibl/files/sionlibl-respect-flags-v3.patch
index 6f21f3b95..7bf98ced1 100644
--- a/sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
+++ b/sys-cluster/sionlibl/files/sionlibl-respect-flags-v3.patch
@@ -104,6 +104,58 @@
  SZLIB_LIBPATH  = -L$(TOPDIR)/utils/szlib
  SZLIB_LIB  = -lsc.z
  
+--- a/mf/Makefile.defs.linux-gomp10
 b/mf/Makefile.defs.linux-gomp10
+@@ -23,24 +23,19 @@
+ 
#--
+ # SIONlib General Settings
+ 
#--
+-OPTFLAGS = -g -O0 -Wall
++CFLAGS   += -std=c99 $(PFLAG) -fPIC
+ 
+-CC   = gcc
+-CFLAGS   = -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
++CXXFLAGS += $(PFLAG)
+ 
+-CXX  = g++
+-CXXFLAGS = $(PFLAG) $(OPTFLAGS) -O3
+-
+-F77  = gfortran
+-FFLAGS   = $(PFLAG) $(OPTFLAGS) -fallow-argument-mismatch
++FFLAGS   += $(PFLAG) -fallow-argument-mismatch
+ 
+ F90  = $(F77)
+-F90FLAGS = $(PFLAG) $(OPTFLAGS) -ffree-form -fallow-argument-mismatch
++F90FLAGS += $(PFLAG) -ffree-form -fallow-argument-mismatch
+ 
+ FPP  =
+ FDOPT= -D
+ 
+-LDFLAGS  = $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
++LDFLAGS  += $(PFLAG) $(HINTSLIB)
+ UTILLIB  =
+ FOBASE   = pomp_fwrapper_base.o
+ 
+@@ -101,10 +96,6 @@
+ 
#--
+ 
+ MPIENABLE = 1
+-MPICC = mpicc
+-MPICXX= mpicxx
+-MPIF77= mpif77
+-MPIF90= mpif90
+ MPILIB= -lmpich
+ PMPILIB   = -lpmpich
+ #PMPILIB   = # MPICH2
+@@ -139,7 +130,7 @@
+ 
#--
+ 
+ SZLIB  = szlib
+-SZLIB_OPTFLAGS = -O3
++SZLIB_OPTFLAGS = $(CFLAGS)
+ SZLIB_CFLAGS   = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED
+ SZLIB_LIBPATH  = -L$(TOPDIR)/utils/szlib
+ SZLIB_LIB  = -lsc.z
 --- a/src/fortraninterface/Makefile
 +++ b/src/fortraninterface/Makefile
 @@ -121,21 +121,21 @@

diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild 
b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
index 7af52bec0..480e0a0c0 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 "
 
 REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
-PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-respect-flags-v3.patch" )
 
 pkg_setup() {
FORTRAN_NEED_OPENMP=0

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/files/, sys-cluster/sionlibl/

2021-08-26 Thread Alessandro Barbieri 
commit: 800e9271018c20096922f6daa0ba1ffb74c30e2d
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Aug 26 14:37:11 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Thu Aug 26 14:37:11 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=800e9271

sys-cluster/sionlibl: move sed to patch

Signed-off-by: Alessandro Barbieri  gmail.com>

 ...espect-flags.patch => sionlibl-respect-flags-v2.patch} | 15 ++-
 sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild |  8 +---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch 
b/sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
similarity index 87%
rename from sys-cluster/sionlibl/files/sionlibl-respect-flags.patch
rename to sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
index a7ac351ea..6f21f3b95 100644
--- a/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch
+++ b/sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
@@ -8,6 +8,19 @@
  COMP=
  if [ -z "$CC" ]; then
echo "No 'cc' located!"
+--- a/config/determine-compiler-version.sh
 b/config/determine-compiler-version.sh
+@@ -24,8 +24,8 @@
+  | cut -d\  -f 1`
+COMPVER="${CVER}/${FVER}"
+;;
+-  gnu) COMPVER=`gcc -dumpfullversion -dumpversion`
+-   #COMPVER=`gcc -v 2>&1 | grep -i 'Version [0-9]' \
++  gnu) COMPVER=`${CC} -dumpfullversion -dumpversion`
++   #COMPVER=`${CC} -v 2>&1 | grep -i 'Version [0-9]' \
+#  | sed -e 's/^.*ersion \(.\..\..\).*$/\1/'`
+;;
+   *)   ErrorAndExit "Unknown compiler '${COMP}'"
 --- a/config/select-compiler.sh
 +++ b/config/select-compiler.sh
 @@ -9,7 +9,7 @@
@@ -93,7 +106,7 @@
  
 --- a/src/fortraninterface/Makefile
 +++ b/src/fortraninterface/Makefile
-@@ -121,21 +122,21 @@
+@@ -121,21 +121,21 @@
$(CPP) $(F90FLAGS) $(F90FLAGS_CPP) $(F90MPIFLAGS) -P -E -I ../lib 
sion_f90_mpi.F90 > sion_f90_mpi.f90
  sion_f90_mpi.mod : sion_f90_mpi.o
  sion_f90_mpi.o : sion_f90_mpi.f90 sion_f90.mod $(SION_HDRS)

diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild 
b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
index c31355c5a..7af52bec0 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 "
 
 REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
-PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
+PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" )
 
 pkg_setup() {
FORTRAN_NEED_OPENMP=0
@@ -45,12 +45,6 @@ pkg_setup() {
fortran-2_pkg_setup
 }
 
-src_prepare() {
-   default
-   sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || 
die
-   sed 's/`gcc/`${CC}/' -i config/determine-compiler-version.sh || die
-}
-
 src_configure() {
tc-export AR CC CXX F77 FC
export MPICC=/usr/bin/mpicc

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/

2021-07-26 Thread Alessandro Barbieri 
commit: 2e5755fa520ac0b0ca5bb9dd21548dbdffaa6d2c
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Jul 26 23:27:43 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Jul 26 23:28:43 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2e5755fa

sys-cluster/sionlibl: sionfwd use

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/sionlibl/metadata.xml   |  7 ++-
 .../{sionlibl-1.7.7.ebuild => sionlibl-1.7.7-r1.ebuild} | 17 +++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/sionlibl/metadata.xml 
b/sys-cluster/sionlibl/metadata.xml
index 32002cf2d..0f8c4f1a8 100644
--- a/sys-cluster/sionlibl/metadata.xml
+++ b/sys-cluster/sionlibl/metadata.xml
@@ -18,17 +18,22 @@ Both, the estimated chunk size and file system block size 
are used to align indi
 
 SIONlib provides two different interfaces: one for parallel access (with 
implementations for different parallel programming technologies such as MPI, 
OpenMP and hybrid MPI+OpenMP) and one for sequential access which is also used 
internally by the SIONlib utilities.

+   
+   
https://gitlab.jsc.fz-juelich.de/cstao-public/SIONlib/SIONlib/-/issues
+   


Enable C++ support
enable SIONlib debug
+   deep-est-sdv collector selection 
plug-in for MSA-aware collective I/O
Enable Fortran support
+   hostname-regex collector selection 
plug-in for MSA-aware collective I/O
enable mpi
enable python support
enable hybrid openmp mpi
enable openmp
Enable compilation of parutils (used for 
benchmarking)
configure SIONlib to use pthreads for 
locking
-   
+   enable I/O forwarding with 
sys-cluster/SIONfwd

 

diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7.ebuild 
b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
similarity index 88%
rename from sys-cluster/sionlibl/sionlibl-1.7.7.ebuild
rename to sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
index 1e2156aa5..c31355c5a 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
@@ -18,12 +18,7 @@ S="${WORKDIR}/sionlib"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads 
python"
-#TODO: cuda sionfwd msa
-#--enable-sionfwd=/path/to/sionfwd
-#--msa=(hostname-regex|deep-est-sdv)]  MSA aware collective operations for the 
given system
-
-PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
+IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi 
+openmp +parutils +pthreads python sionfwd" #cuda
 
 RDEPEND="
mpi? ( virtual/mpi )
@@ -32,12 +27,16 @@ RDEPEND="
virtual/mpi
)
openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) )
+   sionfwd? ( sys-cluster/SIONfwd )
 "
 DEPEND="
${RDEPEND}
${PYTHON_DEPS}
 "
 
+REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
+PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
+
 pkg_setup() {
FORTRAN_NEED_OPENMP=0
use openmp && FORTRAN_NEED_OPENMP=1
@@ -64,8 +63,13 @@ src_configure() {
 
append-fflags -fallow-argument-mismatch
 
+   local msa="none"
+   use deep-est-sdv && msa="deep-est-sdv"
+   use hostname-regex && msa="hostname-regex"
+
local myconf=(
--disable-mic
+   --msa="${msa}"
--prefix="${T}/prefix/usr"
)
 
@@ -80,6 +84,7 @@ src_configure() {
 
use debug && myconf+=( "--enable-debug" )
use python && myconf+=( "--enable-python=3" )
+   use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" )
 
./configure "${myconf[@]}" || die
 }

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/files/, sys-cluster/sionlibl/

2021-07-25 Thread Alessandro Barbieri 
commit: 0c995ec7d11c6abf50ca70b77c0e24b97bda83dd
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Jul 25 18:24:30 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Jul 25 20:18:55 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0c995ec7

sys-cluster/sionlibl: initial import

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/sionlibl/Manifest  |   1 +
 .../sionlibl/files/sionlibl-respect-flags.patch| 120 +
 sys-cluster/sionlibl/metadata.xml  |  34 ++
 sys-cluster/sionlibl/sionlibl-1.7.7.ebuild | 118 
 4 files changed, 273 insertions(+)

diff --git a/sys-cluster/sionlibl/Manifest b/sys-cluster/sionlibl/Manifest
new file mode 100644
index 0..8ce6ed0a6
--- /dev/null
+++ b/sys-cluster/sionlibl/Manifest
@@ -0,0 +1 @@
+DIST sionlibl-1.7.7.tar.gz 490515 BLAKE2B 
76971dd6d80222144b40da345d58311911aab09c6a5250b85d4a2731d2f93cdbd39d87dd6bbafdeaba88f06603105076267f6956417916f118ec45e07fa59269
 SHA512 
6ef46a0905552c558595bf6b72225a290d73dc87fa33c9862de5e4bd4d683792437646f7b4ab8a463b4a50d1b4a79aec96a66e577e815de3f23e9274be2681af

diff --git a/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch 
b/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch
new file mode 100644
index 0..a7ac351ea
--- /dev/null
+++ b/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch
@@ -0,0 +1,120 @@
+--- a/config/determine-cc.sh
 b/config/determine-cc.sh
+@@ -1,7 +1,6 @@
+ #!/bin/sh
+ # determine what compiler is behind "cc" (and presumably "CC" and "ftn") 
wrapper
+ 
+-CC=`which cc 2>/dev/null`
+ COMP=
+ if [ -z "$CC" ]; then
+   echo "No 'cc' located!"
+--- a/config/select-compiler.sh
 b/config/select-compiler.sh
+@@ -9,7 +9,7 @@
+ CPS=""
+ COMP=""
+ 
+-GNU=`which gcc 2> /dev/null`
++GNU="${CC}"
+ if [ -n "${GNU}" ]
+ then
+   NCPS=`expr ${NCPS} + 1`
+--- a/config/select-mpi.sh
 b/config/select-mpi.sh
+@@ -76,7 +76,6 @@
+   if [ -z "${MPIS}" ]; then MPIS="${MPI}"; else MPIS="${MPIS}|${MPI}"; fi
+ fi
+ 
+-MPICC=`which mpicc 2> /dev/null`
+ if [ -n "${MPICC}" ]
+ then
+   FMPI=""
+@@ -86,7 +85,7 @@
+   MPIROOTDIR1=`dirname ${MBINDIR}`
+ 
+   echo "#include " > conftest.c
+-  mpicc -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt
++  "${MPICC}" -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt
+   MINCDIR=`cat mpiconf.txt | sed -e 's#^.* "##' -e 's#/mpi.h".*##'`
+   if [ -n "${MINCDIR}" ]
+   then
+--- a/mf/Makefile.defs.linux-gomp
 b/mf/Makefile.defs.linux-gomp
+@@ -23,24 +23,19 @@
+ 
#--
+ # SIONlib General Settings
+ 
#--
+-OPTFLAGS = -g -O0 -Wall
++CFLAGS   += -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
+ 
+-CC   = gcc
+-CFLAGS   = -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
++CXXFLAGS += $(PFLAG) $(OPTFLAGS) -fPIC
+ 
+-CXX  = g++
+-CXXFLAGS = $(PFLAG) $(OPTFLAGS) -O3
+-
+-F77  = gfortran
+-FFLAGS   = $(PFLAG) $(OPTFLAGS)
++FFLAGS   += $(PFLAG) $(OPTFLAGS) -fPIC
+ 
+ F90  = $(F77)
+-F90FLAGS = $(PFLAG) $(OPTFLAGS) -ffree-form
++F90FLAGS += $(PFLAG) $(OPTFLAGS) -ffree-form -fPIC $(FCFLAGS)
+ 
+ FPP  =
+ FDOPT= -D
+ 
+-LDFLAGS  = $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
++LDFLAGS  += $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
+ UTILLIB  =
+ FOBASE   = pomp_fwrapper_base.o
+ 
+@@ -101,10 +96,6 @@
+ 
#--
+ 
+ MPIENABLE = 1
+-MPICC = mpicc
+-MPICXX= mpicxx
+-MPIF77= mpif77
+-MPIF90= mpif90
+ MPILIB= -lmpich
+ PMPILIB   = -lpmpich
+ #PMPILIB   = # MPICH2
+@@ -139,8 +130,7 @@
+ 
#--
+ 
+ SZLIB  = szlib
+-SZLIB_OPTFLAGS = -O3
+-SZLIB_CFLAGS   = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED
++SZLIB_CFLAGS   = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED 
$(CFLAGS)
+ SZLIB_LIBPATH  = -L$(TOPDIR)/utils/szlib
+ SZLIB_LIB  = -lsc.z
+ 
+--- a/src/fortraninterface/Makefile
 b/src/fortraninterface/Makefile
+@@ -121,21 +122,21 @@
+   $(CPP) $(F90FLAGS) $(F90FLAGS_CPP) $(F90MPIFLAGS) -P -E -I ../lib 
sion_f90_mpi.F90 > sion_f90_mpi.f90
+ sion_f90_mpi.mod : sion_f90_mpi.o
+ sion_f90_mpi.o : sion_f90_mpi.f90 sion_f90.mod $(SION_HDRS)
+-  $(MPIF90) $(F90FLAGS) -c sion_f90_mpi.f90
++  $(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_mpi.f90
+ 
+ # F90 Interface (OMP)
+ sion_f90_omp.f90: sion_f90_omp.F90
+   $(CPP) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib 
sion_f90_omp.F90 > sion_f90_omp.f90
+ sion_f90_omp.mod : sion_f90_omp.o 
+ sion_f90_omp.o : sion_f90_omp.f90 sion_f90.mod $(SION_HDRS)
+-  $(OMPF90) $(F90FLAGS) -c sion_f90_omp.f90
++  $(OMPF90) $(F90FLAGS) $(F90OMPFLAGS) -c sion_f90_omp.f90
+ 
+ # F90 Interface (OMPI)
+ sion_f90_ompi.f90:

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlibl/files/, sys-cluster/sionlib/, sys-cluster/sionlib/files/, ...

2021-07-25 Thread Alessandro Barbieri 
commit: c27e0053fa68318c60dfb94d9c2728abd5086b35
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Jul 25 20:17:19 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Jul 25 20:18:55 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c27e0053

sys-cluster/*: merge sionlibl with sionlib

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/sionlib/Manifest   |   3 +-
 sys-cluster/sionlib/files/respect-flags.patch  | 134 -
 .../files/sionlib-respect-flags.patch} |   0
 sys-cluster/sionlib/metadata.xml   |   3 +-
 sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild| 117 --
 .../sionlib-1.7.7.ebuild}  |   9 +-
 sys-cluster/sionlibl/Manifest  |   1 -
 sys-cluster/sionlibl/metadata.xml  |  34 --
 8 files changed, 10 insertions(+), 291 deletions(-)

diff --git a/sys-cluster/sionlib/Manifest b/sys-cluster/sionlib/Manifest
index 9046f5a2b..8fc118f36 100644
--- a/sys-cluster/sionlib/Manifest
+++ b/sys-cluster/sionlib/Manifest
@@ -1 +1,2 @@
-DIST sionlib-1.7.6.tar.gz 486418 BLAKE2B 
885eb2012ec6da031f5ae8b093ee4f3e5bbe31c9b24a11576f2ad01b32ddd8a85051565034f0e6c756af51409fb89f9c79f80b35c8337f2dc7912cb9e54d909b
 SHA512 
afdd8520f489bc940edc51ffa636a25cad778de07bfbb21d2bd2ab767e57b16044990d85ef44d2e6482a376196f5c6a2a6f1a71556dd987f8094dd396a971d1c
+DIST sionlib-1.7.7.tar.gz 489080 BLAKE2B 
1ffd06d1b245034b28700af1249135347cdd731a7af23ad96a27b5b5a11d64d9a67249fcd1c44cea43face1066e7ae1d59681e84cef2041e18f02e0c3e8f70ee
 SHA512 
f270467e09893adf1af6103557365acbc9a3e73fe08716a21de6f59b25be9b187ee1c1ec1d878a9599e735f98da470b5e2e184774c27ed0ff0c330c5bf0a5677
+DIST sionlibl-1.7.7.tar.gz 490515 BLAKE2B 
76971dd6d80222144b40da345d58311911aab09c6a5250b85d4a2731d2f93cdbd39d87dd6bbafdeaba88f06603105076267f6956417916f118ec45e07fa59269
 SHA512 
6ef46a0905552c558595bf6b72225a290d73dc87fa33c9862de5e4bd4d683792437646f7b4ab8a463b4a50d1b4a79aec96a66e577e815de3f23e9274be2681af

diff --git a/sys-cluster/sionlib/files/respect-flags.patch 
b/sys-cluster/sionlib/files/respect-flags.patch
deleted file mode 100644
index 9ff5bd384..0
--- a/sys-cluster/sionlib/files/respect-flags.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff '--color=auto' -ru a/config/determine-cc.sh b/config/determine-cc.sh
 a/config/determine-cc.sh   2021-04-25 01:09:35.175990108 +0200
-+++ b/config/determine-cc.sh   2021-04-25 01:10:02.876433713 +0200
-@@ -1,7 +1,6 @@
- #!/bin/sh
- # determine what compiler is behind "cc" (and presumably "CC" and "ftn") 
wrapper
- 
--CC=`which cc 2>/dev/null`
- COMP=
- if [ -z "$CC" ]; then
-   echo "No 'cc' located!"
-diff '--color=auto' -ru a/config/select-compiler.sh b/config/select-compiler.sh
 a/config/select-compiler.sh2021-04-25 01:09:35.175990108 +0200
-+++ b/config/select-compiler.sh2021-04-25 01:10:26.882817842 +0200
-@@ -9,7 +9,7 @@
- CPS=""
- COMP=""
- 
--GNU=`which gcc 2> /dev/null`
-+GNU="${CC}"
- if [ -n "${GNU}" ]
- then
-   NCPS=`expr ${NCPS} + 1`
-diff '--color=auto' -ru a/config/select-mpi.sh b/config/select-mpi.sh
 a/config/select-mpi.sh 2021-04-25 01:09:35.175990108 +0200
-+++ b/config/select-mpi.sh 2021-04-25 01:12:41.269962840 +0200
-@@ -76,7 +76,6 @@
-   if [ -z "${MPIS}" ]; then MPIS="${MPI}"; else MPIS="${MPIS}|${MPI}"; fi
- fi
- 
--MPICC=`which mpicc 2> /dev/null`
- if [ -n "${MPICC}" ]
- then
-   FMPI=""
-@@ -86,7 +85,7 @@
-   MPIROOTDIR1=`dirname ${MBINDIR}`
- 
-   echo "#include " > conftest.c
--  mpicc -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt
-+  "${MPICC}" -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt
-   MINCDIR=`cat mpiconf.txt | sed -e 's#^.* "##' -e 's#/mpi.h".*##'`
-   if [ -n "${MINCDIR}" ]
-   then
-diff '--color=auto' -ru a/mf/Makefile.defs.linux-gomp 
b/mf/Makefile.defs.linux-gomp
 a/mf/Makefile.defs.linux-gomp  2021-04-25 01:09:35.119989211 +0200
-+++ b/mf/Makefile.defs.linux-gomp  2021-04-25 01:52:32.378951608 +0200
-@@ -23,24 +23,19 @@
- 
#--
- # SIONlib General Settings
- 
#--
--OPTFLAGS = -g -O0 -Wall
-+CFLAGS   += -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
- 
--CC   = gcc
--CFLAGS   = -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
-+CXXFLAGS += $(PFLAG) $(OPTFLAGS) -fPIC
- 
--CXX  = g++
--CXXFLAGS = $(PFLAG) $(OPTFLAGS) -O3
--
--F77  = gfortran
--FFLAGS   = $(PFLAG) $(OPTFLAGS)
-+FFLAGS   += $(PFLAG) $(OPTFLAGS) -fPIC
- 
- F90  = $(F77)
--F90FLAGS = $(PFLAG) $(OPTFLAGS) -ffree-form
-+F90FLAGS += $(PFLAG) $(OPTFLAGS) -ffree-form -fPIC $(FCFLAGS)
- 
- FPP  =
- FDOPT= -D
- 
--LDFLAGS  = $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
-+LDFLAGS  += $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
- UTILLIB  =
- FOBASE   = pomp_fwrapper_base.o
- 
-@@ -101,10 +96,6 @@
-