subject:"\[gentoo\-commits\] repo\/proj\/guru\:dev commit in\: sys\-cluster\/sionlib\/"

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

2022-06-09 Thread Alessandro Barbieri

commit: 58c97e9106f584db6d57c33cfc4d450fc72f3b47
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Jun  9 22:47:12 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=58c97e91

sys-cluster/sionlib: fix mpich detection

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

 sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild | 38 +++--
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
index 06981810e..4e0eba149 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r4.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" )
@@ -126,3 +128,23 @@ src_install() {
 
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/sionlib/

2022-05-28 Thread Alessandro Barbieri

commit: 28619647b773f4f11aa6e88a54935bbb495b61da
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sat May 28 12:45:31 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=28619647

sys-cluster/sionlib: enable py3.11

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

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

diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
index 3cc5f940f..06981810e 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r4.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/sionlib/files/

2021-10-15 Thread Alessandro Barbieri

commit: d99c7de558a9e6cfdf97435955fcf96ac1509e8c
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Fri Oct 15 21:16:28 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=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  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_LIB

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

2021-08-29 Thread Alessandro Barbieri

commit: a14419ec41f6ed065fe21a13787982c22230d6a9
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Aug 29 23:15:30 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Aug 29 23:15:30 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a14419ec

sys-cluster/sionlib: reorder lib link

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

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

2021-08-29 Thread Alessandro Barbieri

commit: 80ceb49a9fca18a91c44ebbcf67774ff9b6648e0
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Aug 29 22:32:30 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=80ceb49a

sys-cluster/sionlib: merge patches

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

 .../files/sionlib-build-shared-libraries.patch | 46 ++-
 .../sionlib/files/sionlib-fix-linking.patch| 52 --
 sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild|  1 -
 3 files changed, 35 insertions(+), 64 deletions(-)

diff --git a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch 
b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
index 30e6cd32e..6d5c69f48 100644
--- a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
+++ b/sys-cluster/sionlib/files/sionlib-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_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:
@@ -212,25 +219,25 @@
 -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) 
../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$(SION_LIBNAME_COM)
++  $(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) 
../lib/lib$(SION_LIBNAME_COM).so
-+  $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ 
$(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) 
$(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) 
../lib/lib$(SION_LIBNAME_COM).so
-+  $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ 
$(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM)
++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) 
../lib/lib$(SION_LIBNAME_COM).so
-+  $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o 
$@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) 
$(HYBFLAG)
++lib$(SION_LIBNAME_OMPI).so : $(SION_OBJS

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

2021-08-29 Thread Alessandro Barbieri

commit: 9eae29ade42e8dbbab389b3b19543d793363e202
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Aug 29 15:39:40 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=9eae29ad

sys-cluster/sionlib: fix linking issues

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

 .../files/sionlib-build-shared-libraries.patch | 16 +++
 .../sionlib/files/sionlib-fix-linking.patch| 52 ++
 ...lib-1.7.7-r3.ebuild => sionlib-1.7.7-r4.ebuild} |  7 ++-
 3 files changed, 65 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 2f41d58c1..30e6cd32e 100644
--- a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
+++ b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
@@ -211,26 +211,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$(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
++  $(CC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMP).so -shared -o $@ 
$(SION_OBJS_OMP) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) 
$(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
++  $(MPICC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_MPI).so -shared -o $@ 
$(SION_OBJS_MPI) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM)
@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
++  $(HYBCC) $(LDFLAGS) -Wl,-soname,lib$(SION_LIBNAME_OMPI).so -shared -o 
$@ $(SION_OBJS_HYB) $(SION_OBJS_INTERNAL) $(LOCKLINK) -l$(SION_LIBNAME_COM) 
$(HYBFLAG)
@echo "*** $@ built"
  
  sion_generic.o : sion_generic.c

diff --git a/sys-cluster/sionlib/files/sionlib-fix-linking.patch 
b/sys-cluster/sionlib/files/sionlib-fix-linking.patch
new file mode 100644
index 0..7148eff31
--- /dev/null
+++ b/sys-cluster/sionlib/files/sionlib-fix-linking.patch
@@ -0,0 +1,52 @@
+diff '--color=auto' -ru sionlib-ori/src/lib/Makefile sionlib/src/lib/Makefile
+--- sionlib-ori/src/lib/Makefile   2021-08-29 08:14:05.901799434 +0200
 sionlib/src/lib/Makefile   2021-08-29 16:49:25.241515611 +0200
+@@ -66,14 +66,20 @@
+ SION_CXX_HDR = sion_cxx.h
+ endif
+ 
++ifeq ($(PTHREADSUPPORT),"yes")
++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).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).so lib$(SION_LIBNAME_SER).so  
lib$(SION_LIBNAME_COM_LOCK_PTHREADS).so lib$(SION_LIBNAME_COM_LOCK_NONE).so
+ 
+-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) $(SIO

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

2021-08-28 Thread Alessandro Barbieri

commit: 38318b70aa7ad75ce67aa155e86b1c5cf01a7aa0
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Fri Aug 27 00:55:28 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=38318b70

sys-cluster/sionlib: respect flags

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

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

diff --git a/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch 
b/sys-cluster/sionlib/files/sionlib-respect-flags-v3.patch
similarity index 73%
rename from sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
rename to sys-cluster/sionlib/files/sionlib-respect-flags-v3.patch
index 6f21f3b95..7bf98ced1 100644
--- a/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
+++ b/sys-cluster/sionlib/files/sionlib-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/sionlib/sionlib-1.7.7-r2.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
index d9fdfc7af..33e8dbdd8 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi 
+openmp +parutils +pthreads python sionfwd" #cuda
 
 REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
-PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-respect-flags-v3.patch" )
 
 RDEPEND="
mpi? ( virtual/mpi )

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

2021-08-28 Thread Alessandro Barbieri

commit: 45360dcfcc0b88484a72fc357a78c7c159f105d1
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Aug 29 00:32:41 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=45360dcf

sys-cluster/sionlib: fix library linking

Signed-off-by: Alessandro Barbieri  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/Makefile2021-08-29 01:04:54.921546810 +0200
-+++ sionlib/src/parlib/Makefile2021-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/parutil

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

2021-08-28 Thread Alessandro Barbieri

commit: 899c3526b1b0c2bacf460f6c050e47439ede7f74
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sat Aug 28 23:29:35 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=899c3526

sys-cluster/sionlib: build shared libraries

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

 .../files/sionlib-build-shared-libraries.patch | 337 +
 .../sionlib/files/sionlib-respect-flags-v3.patch   |   6 +-
 ...lib-1.7.7-r2.ebuild => sionlib-1.7.7-r3.ebuild} |  11 +-
 3 files changed, 346 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch 
b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
new file mode 100644
index 0..9c1895499
--- /dev/null
+++ b/sys-cluster/sionlib/files/sionlib-build-shared-libraries.patch
@@ -0,0 +1,337 @@
+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
+@@ -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
+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
+@@ -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$(SION_LIBNAME_OMP)
++  F90_SER_LIBS = $(OMPFLAG) -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)
+ 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)
+ 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_

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

2021-08-26 Thread Alessandro Barbieri

commit: 2c89f0b83f35b1aad6d3da4e704d4956ed78a1d1
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Aug 26 14:32:52 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Thu Aug 26 14:32:52 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2c89f0b8

sys-cluster/sionlib: move sed to patch

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

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

diff --git a/sys-cluster/sionlib/files/sionlib-respect-flags.patch 
b/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
similarity index 87%
rename from sys-cluster/sionlib/files/sionlib-respect-flags.patch
rename to sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
index a7ac351ea..6f21f3b95 100644
--- a/sys-cluster/sionlib/files/sionlib-respect-flags.patch
+++ b/sys-cluster/sionlib/files/sionlib-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/sionlib/sionlib-1.7.7-r2.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
index ba466e09b..d9fdfc7af 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi 
+openmp +parutils +pthreads python sionfwd" #cuda
 
 REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
-PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
+PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" )
 
 RDEPEND="
mpi? ( virtual/mpi )
@@ -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/sionlib/

2021-07-26 Thread Alessandro Barbieri

commit: 52790b21744761c6bf53a906a900132c231e1f85
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Jul 26 23:21:36 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=52790b21

sys-cluster/sionlib: add sionfwd use

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

 sys-cluster/sionlib/metadata.xml   |  7 ++-
 .../{sionlib-1.7.7-r1.ebuild => sionlib-1.7.7-r2.ebuild}   | 14 ++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/sionlib/metadata.xml b/sys-cluster/sionlib/metadata.xml
index 32002cf2d..0f8c4f1a8 100644
--- a/sys-cluster/sionlib/metadata.xml
+++ b/sys-cluster/sionlib/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/sionlib/sionlib-1.7.7-r1.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
similarity index 87%
rename from sys-cluster/sionlib/sionlib-1.7.7-r1.ebuild
rename to sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
index cd15e7ad6..87062ea8a 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
@@ -18,11 +18,9 @@ S="${WORKDIR}/${PN}"
 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
+IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi 
+openmp +parutils +pthreads python sionfwd" #cuda
 
+REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
 PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
 
 RDEPEND="
@@ -32,6 +30,7 @@ RDEPEND="
virtual/mpi
)
openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) )
+   sionfwd? ( sys-cluster/SIONfwd )
 "
 DEPEND="
${RDEPEND}
@@ -64,8 +63,14 @@ 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-ime
--disable-mic
+   --msa="${msa}"
--prefix="${T}/prefix/usr"
)
 
@@ -80,6 +85,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/sionlib/

2021-07-26 Thread Alessandro Barbieri

commit: ae80b56104835cc82b25a753d1013044d5c8a643
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Jul 26 23:28:10 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=ae80b561

sys-cluster/sionlib: remove broken --disable

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

 sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
index 87062ea8a..ba466e09b 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
@@ -68,7 +68,6 @@ src_configure() {
use hostname-regex && msa="hostname-regex"
 
local myconf=(
-   --disable-ime
--disable-mic
--msa="${msa}"
--prefix="${T}/prefix/usr"

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

2021-07-26 Thread Alessandro Barbieri

commit: ea4dbdc0e3b427eb797455dfda90e29a28d955a7
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Jul 26 22:14:54 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Jul 26 23:28:42 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea4dbdc0

sys-cluster/*: split sionlibl and make them co-installable

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

 sys-cluster/sionlib/Manifest   |   1 -
 sys-cluster/sionlib/metadata.xml   |   1 -
 ...ionlib-1.7.7.ebuild => sionlib-1.7.7-r1.ebuild} |  15 ++-
 sys-cluster/sionlibl/Manifest  |   1 +
 .../sionlibl/files/sionlibl-respect-flags.patch| 120 +
 sys-cluster/{sionlib => sionlibl}/metadata.xml |   1 -
 .../sionlibl-1.7.7.ebuild} |  23 ++--
 7 files changed, 148 insertions(+), 14 deletions(-)

diff --git a/sys-cluster/sionlib/Manifest b/sys-cluster/sionlib/Manifest
index 8fc118f36..292998421 100644
--- a/sys-cluster/sionlib/Manifest
+++ b/sys-cluster/sionlib/Manifest
@@ -1,2 +1 @@
 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/metadata.xml b/sys-cluster/sionlib/metadata.xml
index df4593cce..32002cf2d 100644
--- a/sys-cluster/sionlib/metadata.xml
+++ b/sys-cluster/sionlib/metadata.xml
@@ -30,6 +30,5 @@ SIONlib provides two different interfaces: one for parallel 
access (with impleme
Enable compilation of parutils (used for 
benchmarking)
configure SIONlib to use pthreads for 
locking

-   Build the tooling version instead

 

diff --git a/sys-cluster/sionlib/sionlib-1.7.7.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.7-r1.ebuild
similarity index 89%
copy from sys-cluster/sionlib/sionlib-1.7.7.ebuild
copy to sys-cluster/sionlib/sionlib-1.7.7-r1.ebuild
index e00956e3a..cd15e7ad6 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r1.ebuild
@@ -12,16 +12,13 @@ inherit docs 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";
-SRC_URI="
-   !tools? ( 
http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P}.tar.gz 
)
-   tools? ( 
http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV}l -> 
${PN}l-${PV}.tar.gz )
-"
+SRC_URI="http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> 
${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads 
python tools"
+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
@@ -103,6 +100,14 @@ src_install() {
rm -r "${T}/prefix/usr/examples" || die
fi
 
+   insinto "/usr/include/sionlib"
+   doins -r "${T}"/prefix/usr/include/*
+   rm -r "${T}/prefix/usr/include" || die
+
+   exeinto "/usr/libexec/${PN}"
+   doexe "${T}"/prefix/usr/bin/*partest
+   rm "${T}"/prefix/usr/bin/*partest || die
+
# move 64 bit libraries to lib64
libs64=( "${T}"/prefix/usr/lib/*64* )
if [[ ${#libs64[@]} -gt 0 ]]; then

diff --git a/sys-cluster/sionlibl/Manifest b/sys-cluster/sionlibl/Manifest
new file mode 100644
index 0..a16495014
--- /dev/null
+++ b/sys-cluster/sionlibl/Manifest
@@ -0,0 +1 @@
+DIST sionlibll-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

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

2021-06-11 Thread Alessandro Barbieri

commit: 5f11bdd50c34d6f82bd0d4a943f6c583fca1b00f
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Jun  3 22:49:37 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Fri Jun 11 15:23:08 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f11bdd5

sys-cluster/sionlib: don't enforce libomp

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index 132bbc341..a63c7bc0f 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -26,10 +26,10 @@ PATCHES=( "${FILESDIR}/respect-flags.patch" )
 RDEPEND="
mpi? ( virtual/mpi )
ompi? (
-   sys-libs/libomp
+   || ( sys-devel/gcc:*[openmp] sys-libs/libomp )
virtual/mpi
)
-   openmp? ( sys-libs/libomp )
+   openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) )
 "
 DEPEND="
${RDEPEND}

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

2021-05-18 Thread Anna Vyalkova

commit: 7a29a09110c5d2834ad092cf25eba1d366692147
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Tue May 18 22:12:37 2021 +
Commit: Anna Vyalkova  sysrq  in>
CommitDate: Tue May 18 22:12:37 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7a29a091

sys-cluster/sionlib: compiler vars + docs eclass

Closes: https://bugs.gentoo.org/790755
Closes: https://bugs.gentoo.org/790752
Closes: https://bugs.gentoo.org/785730
Signed-off-by: Anna Vyalkova  sysrq.in>

 sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index bd43b5fa2..132bbc341 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=7
 
+DOCS_BUILDER="doxygen"
+DOCS_CONFIG_NAME="doxy"
 FORTRAN_NEEDED="fortran"
 PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+inherit docs 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";
@@ -14,7 +16,7 @@ 
SRC_URI="http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
+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
@@ -33,7 +35,6 @@ DEPEND="
${RDEPEND}
${PYTHON_DEPS}
 "
-BDEPEND="doc? ( app-doc/doxygen )"
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
@@ -47,6 +48,7 @@ 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() {
@@ -83,21 +85,21 @@ src_configure() {
 
 src_compile() {
export VARTEXFONTS="${T}/fonts"
-   emake C_AR=$(tc-getAR)
-
-   if use doc ; then
-   doxygen -u doxy || die
-   doxygen doxy || die
-   fi
+   emake C_AR=$(tc-getAR) F90=$(tc-getFC)
+   docs_compile
 }
 
 src_install() {
mkdir -p "${T}/prefix/usr/share/doc/${PF}" || die
default
 
-   mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
+   if use examples ; then
+   mv "${T}/prefix/usr/examples" 
"${T}/prefix/usr/share/doc/${PF}/" || die
+   else
+   rm -r "${T}/prefix/usr/examples" || die
+   fi
 
-   #move 64 bit libraries in lib64
+   # move 64 bit libraries to lib64
libs64=( "${T}"/prefix/usr/lib/*64* )
if [[ ${#libs64[@]} -gt 0 ]]; then
mkdir "${T}/prefix/usr/lib64" || die
@@ -109,9 +111,6 @@ src_install() {
rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die
docompress -x "/usr/share/doc/${PF}/examples"
 
-   use doc && dodoc -r doc/html
-   use doc && docompress -x "/usr/share/doc/${PF}/html"
-
#TODO: build shared libs
#find "${ED}" -name '*.a' -delete || die
find "${ED}" -name '*.la' -delete || die

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

2021-05-16 Thread Anna Vyalkova

commit: 5566e687462c848511bc19f894d33497808a1891
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Sun May 16 15:09:52 2021 +
Commit: Anna Vyalkova  sysrq  in>
CommitDate: Sun May 16 16:11:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5566e687

sys-cluster/sionlib: fix tests

Closes: https://bugs.gentoo.org/786204
Signed-off-by: Anna Vyalkova  sysrq.in>

 sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index 4b8328064..bd43b5fa2 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -44,6 +44,11 @@ pkg_setup() {
fortran-2_pkg_setup
 }
 
+src_prepare() {
+   default
+   sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || 
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/sionlib/

2021-05-16 Thread Anna Vyalkova

commit: e41e695aadbca19c4c09e8c319073e625c5a126f
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Sun May 16 14:00:50 2021 +
Commit: Anna Vyalkova  sysrq  in>
CommitDate: Sun May 16 14:05:03 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e41e695a

sys-cluster/sionlib: fix compiler vars

Closes: https://bugs.gentoo.org/785727
Signed-off-by: Anna Vyalkova  sysrq.in>

 sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index da6004314..4b8328064 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -45,14 +45,11 @@ pkg_setup() {
 }
 
 src_configure() {
-   export AR=$(tc-getAR)
-   export CC=$(tc-getCC)
-   export CXX=$(tc-getCXX)
+   tc-export AR CC CXX F77 FC
export MPICC=/usr/bin/mpicc
export MPICXX=/usr/bin/mpicxx
export MPIF77=/usr/bin/mpif77
export MPIF90=/usr/bin/mpif90
-   export F77=$(tc-getF77)
export F90=$(tc-getFC)
export OMPF77=$(tc-getF77)
export OMPF90=$(tc-getFC)
@@ -81,7 +78,8 @@ src_configure() {
 
 src_compile() {
export VARTEXFONTS="${T}/fonts"
-   default
+   emake C_AR=$(tc-getAR)
+
if use doc ; then
doxygen -u doxy || die
doxygen doxy || die

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

2021-04-26 Thread Alessandro Barbieri

commit: 1c0de12e40e4e4fbd43c57204d5c7a1ae6e97bfb
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr 26 19:55:14 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr 26 19:57:03 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1c0de12e

sys-cluster/sionlib: move 64 bit libs into lib64

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 .../sionlib/{sionlib-1.7.6.ebuild => sionlib-1.7.6-r1.ebuild} | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/sionlib/sionlib-1.7.6.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
similarity index 91%
rename from sys-cluster/sionlib/sionlib-1.7.6.ebuild
rename to sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
index cc8336e88..da6004314 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -15,7 +15,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
-#TODO: fix installation in multilib
 #TODO: cuda sionfwd msa
 #--enable-sionfwd=/path/to/sionfwd
 #--msa=(hostname-regex|deep-est-sdv)]  MSA aware collective operations for the 
given system
@@ -94,6 +93,16 @@ src_install() {
default
 
mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
+
+   #move 64 bit libraries in lib64
+   libs64=( "${T}"/prefix/usr/lib/*64* )
+   if [[ ${#libs64[@]} -gt 0 ]]; then
+   mkdir "${T}/prefix/usr/lib64" || die
+   for l in "${libs64[@]}" ; do
+   mv "${l}" "${T}/prefix/usr/lib64/" || die
+   done
+   fi
+
rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die
docompress -x "/usr/share/doc/${PF}/examples"

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

2021-04-26 Thread Alessandro Barbieri

commit: 8c35571c6b354d6cd8546d17ada65e3525c94672
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr 26 19:07:12 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr 26 19:57:03 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8c35571c

sys-cluster/sionlib: fix doc building

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/sionlib/sionlib-1.7.6.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/sionlib/sionlib-1.7.6.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
index 50b58c797..cc8336e88 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
@@ -83,8 +83,10 @@ src_configure() {
 src_compile() {
export VARTEXFONTS="${T}/fonts"
default
-   use doc && doxygen -u doxy || die
-   use doc && doxygen doxy || die
+   if use doc ; then
+   doxygen -u doxy || die
+   doxygen doxy || die
+   fi
 }
 
 src_install() {

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

2021-04-25 Thread Alessandro Barbieri

commit: 497a558f1db8681db4b063270b73ea8fcce6aeb9
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Apr 25 23:24:41 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Apr 25 23:29:32 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=497a558f

sys-cluster/sionlib: fix stuff

going to close the bug to trigger rebuild

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

 sys-cluster/sionlib/sionlib-1.7.6.ebuild | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys-cluster/sionlib/sionlib-1.7.6.ebuild 
b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
index e1959dcc2..50b58c797 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
+#TODO: fix installation in multilib
 #TODO: cuda sionfwd msa
 #--enable-sionfwd=/path/to/sionfwd
 #--msa=(hostname-regex|deep-est-sdv)]  MSA aware collective operations for the 
given system
@@ -22,7 +23,6 @@ IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils 
+pthreads python"
 PATCHES=( "${FILESDIR}/respect-flags.patch" )
 
 RDEPEND="
-   ${PYTHON_DEPS}
mpi? ( virtual/mpi )
ompi? (
sys-libs/libomp
@@ -30,7 +30,10 @@ RDEPEND="
)
openmp? ( sys-libs/libomp )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+   ${PYTHON_DEPS}
+"
 BDEPEND="doc? ( app-doc/doxygen )"
 S="${WORKDIR}/${PN}"
 
@@ -59,7 +62,7 @@ src_configure() {
 
local myconf=(
--disable-mic
-   --prefix="${EPREFIX}/usr"
+   --prefix="${T}/prefix/usr"
)
 
#custom configure?
@@ -78,25 +81,22 @@ src_configure() {
 }
 
 src_compile() {
+   export VARTEXFONTS="${T}/fonts"
default
-   use doc && doxygen -u doxy && doxygen doxy || die
+   use doc && doxygen -u doxy || die
+   use doc && doxygen doxy || die
 }
 
 src_install() {
-   sed -e "s|\${PREFIX}|${D}/usr|g" -i mf/common.defs || die
-   sed -e "s|\$(PREFIX)|${D}/usr|g" -i src/utils/Makefile || die
-   sed \
-   -e "s|\$(PREFIX)|${D}/usr|g" \
-   -e "s|\${PREFIX}|${D}/usr|g" \
-   -i mf/RealMakefile || die
-
+   mkdir -p "${T}/prefix/usr/share/doc/${PF}" || die
default
 
-   use doc && dodoc -r doc/html
-
-   mv "${ED}/usr/examples" "${ED}/usr/share/doc/${PF}/" || die
+   mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
+   rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die
docompress -x "/usr/share/doc/${PF}/examples"
-   docompress -x "/usr/share/doc/${PF}/html"
+
+   use doc && dodoc -r doc/html
+   use doc && docompress -x "/usr/share/doc/${PF}/html"
 
#TODO: build shared libs
#find "${ED}" -name '*.a' -delete || die

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

2021-04-24 Thread Alessandro Barbieri

commit: 8b1d3fec410cc64f8815b76dd8d413777eb19d65
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Apr 25 01:01:06 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Apr 25 01:01:06 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8b1d3fec

sys-cluster/sionlib: new package

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/sionlib/Manifest  |   1 +
 sys-cluster/sionlib/files/respect-flags.patch | 134 ++
 sys-cluster/sionlib/metadata.xml  |  34 +++
 sys-cluster/sionlib/sionlib-1.7.6.ebuild  | 104 
 4 files changed, 273 insertions(+)

diff --git a/sys-cluster/sionlib/Manifest b/sys-cluster/sionlib/Manifest
new file mode 100644
index 0..9046f5a2b
--- /dev/null
+++ b/sys-cluster/sionlib/Manifest
@@ -0,0 +1 @@
+DIST sionlib-1.7.6.tar.gz 486418 BLAKE2B 
885eb2012ec6da031f5ae8b093ee4f3e5bbe31c9b24a11576f2ad01b32ddd8a85051565034f0e6c756af51409fb89f9c79f80b35c8337f2dc7912cb9e54d909b
 SHA512 
afdd8520f489bc940edc51ffa636a25cad778de07bfbb21d2bd2ab767e57b16044990d85ef44d2e6482a376196f5c6a2a6f1a71556dd987f8094dd396a971d1c

diff --git a/sys-cluster/sionlib/files/respect-flags.patch 
b/sys-cluster/sionlib/files/respect-flags.patch
new file mode 100644
index 0..9ff5bd384
--- /dev/null
+++ b/sys-cluster/sionlib/files/respect-flags.patch
@@ -0,0 +1,134 @@
+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 @@
+ 
#--
+ 
+ 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
+ 
+diff '--color=auto' -ru a/src/fortraninterface/Makefile 
b/src/fortraninterface/Makefile
+--- a/src/fortraninterface/Makefile2021-04-25 01:09:35.141989563 +0200
 b/src/fortraninterface/Makefile2021-04-25 01:23:48.05597659

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

21 matches

Site Navigation

Mail list logo

Footer information