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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6E3F158094 for ; Fri, 22 Jul 2022 20:00:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 508BDE0C08; Fri, 22 Jul 2022 20:00:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51304E0C08 for ; Fri, 22 Jul 2022 20:00:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5A24340DA7 for ; Fri, 22 Jul 2022 20:00:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE5CE52B for ; Fri, 22 Jul 2022 20:00:04 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1658519767.fb66f72d182b9fff1bad801eed85695bd3670188.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/spheno/files/, sci-physics/spheno/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/spheno/files/spheno-3.3.8-gfortran.patch sci-physics/spheno/spheno-3.3.8.ebuild X-VCS-Directories: sci-physics/spheno/files/ sci-physics/spheno/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: fb66f72d182b9fff1bad801eed85695bd3670188 X-VCS-Branch: master Date: Fri, 22 Jul 2022 20:00:04 +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: 779c5cdd-06e2-4206-919b-60721bd23fa4 X-Archives-Hash: 68e9c85a152da29048acb4586476c06c commit: fb66f72d182b9fff1bad801eed85695bd3670188 Author: Alexander Puck Neuwirth neuwirth-informatik de> AuthorDate: Fri Jul 22 17:44:18 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Jul 22 19:56:07 2022 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fb66f72d sci-physics/spheno: Fix toolchain gfortran We should not call gfortran directly. Instead use `FC` provided by toolchain. Signed-off-by: Alexander Puck Neuwirth neuwirth-informatik.de> Closes: https://github.com/gentoo/sci/pull/1161 Signed-off-by: Andrew Ammerlaan gentoo.org> .../spheno/files/spheno-3.3.8-gfortran.patch | 40 ++++++++-------------- sci-physics/spheno/spheno-3.3.8.ebuild | 8 +++-- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/sci-physics/spheno/files/spheno-3.3.8-gfortran.patch b/sci-physics/spheno/files/spheno-3.3.8-gfortran.patch index 732c6c7ee..e4538e7c1 100644 --- a/sci-physics/spheno/files/spheno-3.3.8-gfortran.patch +++ b/sci-physics/spheno/files/spheno-3.3.8-gfortran.patch @@ -1,28 +1,18 @@ ---- a/Makefile 2022-02-16 16:04:19.000000000 +0100 -+++ b/Makefile 2022-02-17 22:13:48.086482293 +0100 -@@ -3,10 +3,10 @@ - # cases NAG's nagfor, gfortran, g95, Lahey's lf95 and Intels ifort - # Please uncomment the corresponding line - # F90 = nagfor --# F90 = gfortran -+F90 = gfortran - # F90 = g95 - # F90 = lf95 --F90 = ifort -+#F90 = ifort - Model = src - version = 400.00 - bin/SPheno: --- a/src/Makefile 2022-07-20 11:47:44.078639381 +0200 -+++ b/src/Makefile 2022-07-20 11:50:40.553222937 +0200 -@@ -23,8 +23,8 @@ ++++ b/src/Makefile 2022-07-22 19:24:00.389938450 +0200 +@@ -9,10 +9,11 @@ + # options for various compilers + # - # gfortran - ifeq (${F90},gfortran) -- comp = -c -O -J${Mdir} -I${InDir} -- LFlagsB = -O -+ comp = -c -O -J${Mdir} -I${InDir} ${FFLAGS} ${FCFLAGS} ${CFLAGS} -+ LFlagsB = -O ${LDFLAGS} - endif +-# Intels ifort, default in optimized mode +-F90 = ifort +-comp = -c -O -module ${Mdir} -I${InDir} +-LFlagsB = -O ++ ++# gentoo toolchain ++F90 = ${F90} ++comp = -c -O -J${Mdir} -I${InDir} ${FFLAGS} ${FCFLAGS} ${CFLAGS} ++LFlagsB = -O ${LDFLAGS} - # g95 + # Intels ifort, debug modus + ifeq (${F90},ifortg) diff --git a/sci-physics/spheno/spheno-3.3.8.ebuild b/sci-physics/spheno/spheno-3.3.8.ebuild index ef9ba6e97..21caf1019 100644 --- a/sci-physics/spheno/spheno-3.3.8.ebuild +++ b/sci-physics/spheno/spheno-3.3.8.ebuild @@ -3,12 +3,15 @@ EAPI=8 +inherit toolchain-funcs + MY_PN=SPheno MY_P=${MY_PN}-${PV} DESCRIPTION="SPheno stands for S(upersymmetric) Pheno(menology)" HOMEPAGE="https://spheno.hepforge.org/" SRC_URI="https://spheno.hepforge.org/downloads/?f=${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="all-rights-reserved" RESTRICT="bindist mirror" @@ -20,12 +23,11 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-gfortran.patch ) -S="${WORKDIR}/${MY_P}" - src_compile() { # single thread force needed since fortan mods depend on each other export MAKEOPTS=-j1 - emake + F90=`tc-getFC` + emake F90="${F90}" } src_install() {