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