Gentoo Archives: gentoo-commits

From: Anna Vyalkova <cyber+gentoo@×××××.in>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/
Date: Tue, 18 May 2021 22:13:37
Message-Id: 1621375957.7a29a09110c5d2834ad092cf25eba1d366692147.cybertailor@gentoo
1 commit: 7a29a09110c5d2834ad092cf25eba1d366692147
2 Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in>
3 AuthorDate: Tue May 18 22:12:37 2021 +0000
4 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
5 CommitDate: Tue May 18 22:12:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7a29a091
7
8 sys-cluster/sionlib: compiler vars + docs eclass
9
10 Closes: https://bugs.gentoo.org/790755
11 Closes: https://bugs.gentoo.org/790752
12 Closes: https://bugs.gentoo.org/785730
13 Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>
14
15 sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild | 27 +++++++++++++--------------
16 1 file changed, 13 insertions(+), 14 deletions(-)
17
18 diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
19 index bd43b5fa2..132bbc341 100644
20 --- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
21 +++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
22 @@ -3,9 +3,11 @@
23
24 EAPI=7
25
26 +DOCS_BUILDER="doxygen"
27 +DOCS_CONFIG_NAME="doxy"
28 FORTRAN_NEEDED="fortran"
29 PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
30 -inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
31 +inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs
32
33 DESCRIPTION="Scalable I/O library for parallel access to task-local files"
34 HOMEPAGE="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html"
35 @@ -14,7 +16,7 @@ SRC_URI="http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P
36 LICENSE="BSD"
37 SLOT="0"
38 KEYWORDS="~amd64"
39 -IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
40 +IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads python"
41 #TODO: cuda sionfwd msa
42 #--enable-sionfwd=/path/to/sionfwd
43 #--msa=(hostname-regex|deep-est-sdv)] MSA aware collective operations for the given system
44 @@ -33,7 +35,6 @@ DEPEND="
45 ${RDEPEND}
46 ${PYTHON_DEPS}
47 "
48 -BDEPEND="doc? ( app-doc/doxygen )"
49 S="${WORKDIR}/${PN}"
50
51 pkg_setup() {
52 @@ -47,6 +48,7 @@ pkg_setup() {
53 src_prepare() {
54 default
55 sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || die
56 + sed 's/`gcc/`${CC}/' -i config/determine-compiler-version.sh || die
57 }
58
59 src_configure() {
60 @@ -83,21 +85,21 @@ src_configure() {
61
62 src_compile() {
63 export VARTEXFONTS="${T}/fonts"
64 - emake C_AR=$(tc-getAR)
65 -
66 - if use doc ; then
67 - doxygen -u doxy || die
68 - doxygen doxy || die
69 - fi
70 + emake C_AR=$(tc-getAR) F90=$(tc-getFC)
71 + docs_compile
72 }
73
74 src_install() {
75 mkdir -p "${T}/prefix/usr/share/doc/${PF}" || die
76 default
77
78 - mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
79 + if use examples ; then
80 + mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die
81 + else
82 + rm -r "${T}/prefix/usr/examples" || die
83 + fi
84
85 - #move 64 bit libraries in lib64
86 + # move 64 bit libraries to lib64
87 libs64=( "${T}"/prefix/usr/lib/*64* )
88 if [[ ${#libs64[@]} -gt 0 ]]; then
89 mkdir "${T}/prefix/usr/lib64" || die
90 @@ -109,9 +111,6 @@ src_install() {
91 rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die
92 docompress -x "/usr/share/doc/${PF}/examples"
93
94 - use doc && dodoc -r doc/html
95 - use doc && docompress -x "/usr/share/doc/${PF}/html"
96 -
97 #TODO: build shared libs
98 #find "${ED}" -name '*.a' -delete || die
99 find "${ED}" -name '*.la' -delete || die