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 8023E158094 for ; Sun, 7 Aug 2022 07:21:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82B73E0BB8; Sun, 7 Aug 2022 07:21:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4F758E0BB8 for ; Sun, 7 Aug 2022 07:21:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 261C1340E9A for ; Sun, 7 Aug 2022 07:21:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DE5B1E for ; Sun, 7 Aug 2022 07:20:59 +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: <1659856848.128f7ed51c79a81eb10d7751b8f00d5a61f35960.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/spheno/, sci-physics/spheno/files/ 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/ sci-physics/spheno/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 128f7ed51c79a81eb10d7751b8f00d5a61f35960 X-VCS-Branch: master Date: Sun, 7 Aug 2022 07:20:59 +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: 966d76de-cbc4-4329-af55-720ec0a03ce4 X-Archives-Hash: 838e3d2cd0620605f7b305517f55d42a commit: 128f7ed51c79a81eb10d7751b8f00d5a61f35960 Author: Alexander Puck Neuwirth neuwirth-informatik de> AuthorDate: Sun Jul 24 00:29:19 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Aug 7 07:20:48 2022 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=128f7ed5 sci-physics/spheno: tc-export AR Signed-off-by: Alexander Puck Neuwirth neuwirth-informatik.de> Closes: https://github.com/gentoo/sci/pull/1162 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-physics/spheno/files/spheno-3.3.8-gfortran.patch | 16 +++++++++++++++- sci-physics/spheno/spheno-3.3.8.ebuild | 4 ++-- 2 files changed, 17 insertions(+), 3 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 e4538e7c1..8f6fa7e19 100644 --- a/sci-physics/spheno/files/spheno-3.3.8-gfortran.patch +++ b/sci-physics/spheno/files/spheno-3.3.8-gfortran.patch @@ -1,5 +1,5 @@ --- a/src/Makefile 2022-07-20 11:47:44.078639381 +0200 -+++ b/src/Makefile 2022-07-22 19:24:00.389938450 +0200 ++++ b/src/Makefile 2022-07-24 02:16:38.972041809 +0200 @@ -9,10 +9,11 @@ # options for various compilers # @@ -16,3 +16,17 @@ # Intels ifort, debug modus ifeq (${F90},ifortg) +@@ -70,11 +71,11 @@ + # + .f90.a: + ${F90} ${comp} $< +- ar -ruc $@ $*.o ++ $(AR) -ruc $@ $*.o + rm -f $*.o + .F90.a: + ${F90} ${comp} ${PreDef} $< +- ar -ruc $@ $*.o ++ $(AR) -ruc $@ $*.o + rm -f $*.o + .f90.o: + ${F90} ${comp} $< diff --git a/sci-physics/spheno/spheno-3.3.8.ebuild b/sci-physics/spheno/spheno-3.3.8.ebuild index 21caf1019..9a740b89e 100644 --- a/sci-physics/spheno/spheno-3.3.8.ebuild +++ b/sci-physics/spheno/spheno-3.3.8.ebuild @@ -26,8 +26,8 @@ PATCHES=( "${FILESDIR}"/${P}-gfortran.patch ) src_compile() { # single thread force needed since fortan mods depend on each other export MAKEOPTS=-j1 - F90=`tc-getFC` - emake F90="${F90}" + tc-export FC AR + emake AR="${AR}" F90="${FC}" } src_install() {