From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/openmx/
Date: Mon, 24 Jan 2022 16:06:45 +0000 (UTC) [thread overview]
Message-ID: <1643039559.e8f559a24eb6e60e1ffa71bebd3e318a19d911cb.andrewammerlaan@gentoo> (raw)
commit: e8f559a24eb6e60e1ffa71bebd3e318a19d911cb
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 15:52:39 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 15:52:39 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=e8f559a2
sci-physics/openmx: bump to patch release
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...enmx-3.9.ebuild => openmx-3.9_p20211017.ebuild} | 44 ++++++++++++++++------
1 file changed, 33 insertions(+), 11 deletions(-)
diff --git a/sci-physics/openmx/openmx-3.9.ebuild b/sci-physics/openmx/openmx-3.9_p20211017.ebuild
similarity index 75%
rename from sci-physics/openmx/openmx-3.9.ebuild
rename to sci-physics/openmx/openmx-3.9_p20211017.ebuild
index e58af9665..2d1e50397 100644
--- a/sci-physics/openmx/openmx-3.9.ebuild
+++ b/sci-physics/openmx/openmx-3.9_p20211017.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs flag-o-matic fortran-2
DESCRIPTION="Material eXplorer"
HOMEPAGE="http://www.openmx-square.org/" # no https, SSL invalid
-SRC_URI="http://t-ozaki.issp.u-tokyo.ac.jp/${PN}${PV}.tar.gz"
+SRC_URI="
+ http://t-ozaki.issp.u-tokyo.ac.jp/${PN}${PV//_*}.tar.gz
+ http://www.openmx-square.org/bugfixed/21Oct17/patch${PV//_*}.9.tar.gz
+"
+S="${WORKDIR}/${PN}${PV//_*}/source"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
IUSE="debug openmp test"
RESTRICT="!test? ( test )"
@@ -20,12 +24,12 @@ RDEPEND="
virtual/blas
virtual/lapack
virtual/mpi
+ sci-libs/scalapack
+ sys-cluster/openmpi
sci-libs/fftw:3.0[mpi,openmp?]"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
-S="${WORKDIR}/${PN}${PV}/source"
-
FORTRAN_STANDARD=90
pkg_setup() {
@@ -65,7 +69,7 @@ pkg_setup() {
(( ${ret} )) || break
done
- rm -f "${code}.*"
+ rm "${code}."* || die
popd
if (( ${ret} )); then
@@ -86,7 +90,7 @@ pkg_setup() {
(( ${ret} )) || break
done
- rm -f "${code}.*"
+ rm "${code}."* || die
popd
if (( ${ret} )); then
@@ -98,18 +102,34 @@ pkg_setup() {
}
+src_unpack() {
+ unpack "${PN}${PV//_*}.tar.gz"
+ # copy patched files to source
+ cd "${S}" || die
+ unpack "patch${PV//_*}.9.tar.gz"
+}
+
src_configure() {
local FFTW_FLAVOUR=fftw3
if use openmp; then
FFTW_FLAVOUR=fftw3_omp
+ append-cflag -fopenmp
else
append-cflag -Dnoomp
fi
+ append-cflag -Dkcomp
+ append-cflag -ffast-math
append-cflags $($(tc-getPKG_CONFIG) --cflags lapack)
+ append-cflags $($(tc-getPKG_CONFIG) --cflags scalapack)
+ append-cflags $($(tc-getPKG_CONFIG) --cflags openmpi)
append-cflags $($(tc-getPKG_CONFIG) --cflags ${FFTW_FLAVOUR})
append-fflags -I/usr/include
+ append-fflags -Dkcomp
+ append-fflags -ffast-math
append-fflags $($(tc-getPKG_CONFIG) --cflags lapack)
+ append-fflags $($(tc-getPKG_CONFIG) --cflags scalapack)
+ append-fflags $($(tc-getPKG_CONFIG) --cflags openmpi)
append-fflags $($(tc-getPKG_CONFIG) --cflags ${FFTW_FLAVOUR})
# otherwise we get Error: Rank mismatch between actual argument
@@ -117,6 +137,8 @@ src_configure() {
append-fflags -fallow-argument-mismatch
local MX_LIB="$($(tc-getPKG_CONFIG) --static --libs lapack)"
+ MX_LIB="${MX_LIB} $($(tc-getPKG_CONFIG) --static --libs scalapack)"
+ MX_LIB="${MX_LIB} $($(tc-getPKG_CONFIG) --static --libs openmpi)"
MX_LIB="${MX_LIB} $($(tc-getPKG_CONFIG) --static --libs ${FFTW_FLAVOUR})"
MX_LIB="${MX_LIB} $(mpif90 -showme:link)"
@@ -135,17 +157,17 @@ src_compile() {
}
src_test() {
- cd ../work
+ cd ../work || die
../source/openmx -runtest || die
}
src_install() {
insinto /usr/share/${P}
doins -r DFT_DATA19
- cd ../work
+ cd ../work || die
insinto /usr/share/${P}/examples
doins -r *
- cd ../source
+ cd ../source || die
emake DESTDIR="${D}/usr/bin" install
dodoc "${S}/${PN}${PV%.?}.pdf"
use test && dodoc "${S}"/work/runtest.result
next reply other threads:[~2022-01-24 16:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 16:06 Andrew Ammerlaan [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-16 10:57 [gentoo-commits] proj/sci:master commit in: sci-physics/openmx/ Andrew Ammerlaan
2021-01-19 17:02 Andrew Ammerlaan
2014-06-02 14:05 Honza Macháček
2013-09-26 9:41 Honza Macháček
2013-09-19 7:57 ` Honza Macháček
2013-09-20 9:48 Justin Lecher
2013-07-16 12:58 Honza Macháček
2013-07-16 12:20 Honza Macháček
2013-02-21 22:56 Justin Lecher
2013-01-29 9:31 Kacper Kowalik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1643039559.e8f559a24eb6e60e1ffa71bebd3e318a19d911cb.andrewammerlaan@gentoo \
--to=andrewammerlaan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox