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

[Haelwenn Monnier]

commit:     af129baecbb72fbc346e5221ce45c2e9e6bba15d
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Fri Aug 27 00:58:08 2021 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sun Aug 29 00:33:32 2021 +0000
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 <lssndrbarbieri <AT> 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