[gentoo-commits] proj/sci:master commit in: sci-physics/spheno/, sci-physics/spheno/files/

[Andrew Ammerlaan]

commit:     128f7ed51c79a81eb10d7751b8f00d5a61f35960
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Sun Jul 24 00:29:19 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <alexander <AT> neuwirth-informatik.de>
Closes: https://github.com/gentoo/sci/pull/1162
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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() {