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 BCBCC1580C0 for ; Fri, 27 Aug 2021 16:11:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A7A0E0871; Fri, 27 Aug 2021 16:11:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 64557E0872 for ; Fri, 27 Aug 2021 16:11:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4BEB1342C2F for ; Fri, 27 Aug 2021 16:11:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C48A87B for ; Fri, 27 Aug 2021 16:10:58 +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: <1629988372.2c89f0b83f35b1aad6d3da4e704d4956ed78a1d1.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.patch sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild X-VCS-Directories: sys-cluster/sionlib/files/ sys-cluster/sionlib/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 2c89f0b83f35b1aad6d3da4e704d4956ed78a1d1 X-VCS-Branch: master Date: Fri, 27 Aug 2021 16:10:58 +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: f494c025-2c9f-4e76-9e81-038d02b75611 X-Archives-Hash: 4ae7a1a9fe41e7988765e04e297c5a2b commit: 2c89f0b83f35b1aad6d3da4e704d4956ed78a1d1 Author: Alessandro Barbieri gmail com> AuthorDate: Thu Aug 26 14:32:52 2021 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu Aug 26 14:32:52 2021 +0000 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