* [gentoo-commits] proj/sci:master commit in: sci-physics/spheno/files/, sci-physics/spheno/
@ 2022-07-22 20:00 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2022-07-22 20:00 UTC (permalink / raw
To: gentoo-commits
commit: fb66f72d182b9fff1bad801eed85695bd3670188
Author: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Fri Jul 22 17:44:18 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <alexander <AT> neuwirth-informatik.de>
Closes: https://github.com/gentoo/sci/pull/1161
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/spheno/files/, sci-physics/spheno/
@ 2024-03-14 12:30 Alexander Puck Neuwirth
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Puck Neuwirth @ 2024-03-14 12:30 UTC (permalink / raw
To: gentoo-commits
commit: f582ca64c1dff0d61b9b012515f84887cc227959
Author: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Tue Mar 12 22:05:26 2024 +0000
Commit: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
CommitDate: Thu Mar 14 12:29:46 2024 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f582ca64
sci-physics/spheno: add 4.0.5
Closes: https://github.com/gentoo/sci/pull/1254
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
.../spheno/files/spheno-4.0.5-gfortran.patch | 29 ++++++++++++++++++++++
...{spheno-3.3.8.ebuild => spheno-3.3.8-r1.ebuild} | 14 ++++-------
.../{spheno-3.3.8.ebuild => spheno-4.0.5.ebuild} | 14 ++++-------
3 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/sci-physics/spheno/files/spheno-4.0.5-gfortran.patch b/sci-physics/spheno/files/spheno-4.0.5-gfortran.patch
new file mode 100644
index 000000000..1abf36367
--- /dev/null
+++ b/sci-physics/spheno/files/spheno-4.0.5-gfortran.patch
@@ -0,0 +1,29 @@
+--- a/src/Makefile 2023-05-04 12:33:44.804394098 +0200
++++ b/src/Makefile 2023-05-04 12:34:37.023776033 +0200
+@@ -21,9 +21,9 @@
+ #
+
+ # Intels ifort, default in optimized mode
+-F90 = ifort
+-comp = -c -O -module ${Mdir} -I${InDir}
+-LFlagsB = -O
++F90 = ${F90}
++comp = -c -O -J${Mdir} -I${InDir} ${FFLAGS} ${FCFLAGS} ${CFLAGS}
++LFlagsB = -O ${LDFLAGS}
+
+ # Intels ifort, debug modus
+ ifeq (${F90},ifortg)
+@@ -81,11 +81,11 @@
+ #
+ .f90.a:
+ ${F90} ${comp} $<
+- ar ${linker} $@ $*.o
++ $(AR) ${linker} $@ $*.o
+ rm -f $*.o
+ .F90.a:
+ ${F90} ${comp} ${PreDef} $<
+- ar ${linker} $@ $*.o
++ $(AR) ${linker} $@ $*.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-r1.ebuild
similarity index 84%
copy from sci-physics/spheno/spheno-3.3.8.ebuild
copy to sci-physics/spheno/spheno-3.3.8-r1.ebuild
index 9a740b89e..7ed53c4c7 100644
--- a/sci-physics/spheno/spheno-3.3.8.ebuild
+++ b/sci-physics/spheno/spheno-3.3.8-r1.ebuild
@@ -3,14 +3,14 @@
EAPI=8
-inherit toolchain-funcs
+inherit fortran-2
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"
+SRC_URI="https://spheno.hepforge.org/downloads/?f=${MY_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_P}"
LICENSE="all-rights-reserved"
@@ -18,16 +18,11 @@ RESTRICT="bindist mirror"
SLOT="0"
KEYWORDS="~amd64"
-DEPEND="virtual/fortran"
-RDEPEND="${DEPEND}"
-
PATCHES=( "${FILESDIR}"/${P}-gfortran.patch )
src_compile() {
# single thread force needed since fortan mods depend on each other
- export MAKEOPTS=-j1
- tc-export FC AR
- emake AR="${AR}" F90="${FC}"
+ emake -j1 F90="${FC}"
}
src_install() {
@@ -35,7 +30,8 @@ src_install() {
# convenience symlink since the package is lowercase but the default produced binary is uppercase
dosym ${MY_PN} /usr/bin/${PN}
dolib.a lib/lib${MY_PN}.a
- doheader include/*
+ mv include ${PN}
+ doheader -r ${PN}
dodoc doc/*
docinto examples
dodoc input/*
diff --git a/sci-physics/spheno/spheno-3.3.8.ebuild b/sci-physics/spheno/spheno-4.0.5.ebuild
similarity index 84%
rename from sci-physics/spheno/spheno-3.3.8.ebuild
rename to sci-physics/spheno/spheno-4.0.5.ebuild
index 9a740b89e..7ed53c4c7 100644
--- a/sci-physics/spheno/spheno-3.3.8.ebuild
+++ b/sci-physics/spheno/spheno-4.0.5.ebuild
@@ -3,14 +3,14 @@
EAPI=8
-inherit toolchain-funcs
+inherit fortran-2
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"
+SRC_URI="https://spheno.hepforge.org/downloads/?f=${MY_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_P}"
LICENSE="all-rights-reserved"
@@ -18,16 +18,11 @@ RESTRICT="bindist mirror"
SLOT="0"
KEYWORDS="~amd64"
-DEPEND="virtual/fortran"
-RDEPEND="${DEPEND}"
-
PATCHES=( "${FILESDIR}"/${P}-gfortran.patch )
src_compile() {
# single thread force needed since fortan mods depend on each other
- export MAKEOPTS=-j1
- tc-export FC AR
- emake AR="${AR}" F90="${FC}"
+ emake -j1 F90="${FC}"
}
src_install() {
@@ -35,7 +30,8 @@ src_install() {
# convenience symlink since the package is lowercase but the default produced binary is uppercase
dosym ${MY_PN} /usr/bin/${PN}
dolib.a lib/lib${MY_PN}.a
- doheader include/*
+ mv include ${PN}
+ doheader -r ${PN}
dodoc doc/*
docinto examples
dodoc input/*
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-14 12:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-22 20:00 [gentoo-commits] proj/sci:master commit in: sci-physics/spheno/files/, sci-physics/spheno/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2024-03-14 12:30 Alexander Puck Neuwirth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox