From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2C4B158014 for ; Sun, 29 Aug 2021 17:06:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63E21E08FF; Sun, 29 Aug 2021 17:05:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29356E08FF for ; Sun, 29 Aug 2021 17:05:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29D4833BDF5 for ; Sun, 29 Aug 2021 17:05:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E7369C for ; Sun, 29 Aug 2021 17:05:53 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1630197212.38318b70aa7ad75ce67aa155e86b1c5cf01a7aa0.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/sionlib/files/, sys-cluster/sionlib/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch sys-cluster/sionlib/files/sionlib-respect-flags-v3.patch sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild X-VCS-Directories: sys-cluster/sionlib/ sys-cluster/sionlib/files/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 38318b70aa7ad75ce67aa155e86b1c5cf01a7aa0 X-VCS-Branch: master Date: Sun, 29 Aug 2021 17:05:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0135d377-38c6-4a3e-a840-3efaa89001f7 X-Archives-Hash: f0dfaeb2b864fe80275fcd5a401fd6b9 commit: 38318b70aa7ad75ce67aa155e86b1c5cf01a7aa0 Author: Alessandro Barbieri gmail com> AuthorDate: Fri Aug 27 00:55:28 2021 +0000 Commit: Haelwenn Monnier hacktivis 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 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 )