1 |
commit: cbc37751200389ef4067f1e71b06e09198ea94fc |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 13 05:25:55 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 13 05:26:00 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc37751 |
7 |
|
8 |
sys-cluster/mpich: tidy up ebuild a bit |
9 |
|
10 |
Bug: https://bugs.gentoo.org/808219 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
sys-cluster/mpich/mpich-3.4.2.ebuild | 42 +++++++++++++++++------------------- |
14 |
1 file changed, 20 insertions(+), 22 deletions(-) |
15 |
|
16 |
diff --git a/sys-cluster/mpich/mpich-3.4.2.ebuild b/sys-cluster/mpich/mpich-3.4.2.ebuild |
17 |
index d6e74a25650..21539e686ec 100644 |
18 |
--- a/sys-cluster/mpich/mpich-3.4.2.ebuild |
19 |
+++ b/sys-cluster/mpich/mpich-3.4.2.ebuild |
20 |
@@ -1,43 +1,38 @@ |
21 |
# Copyright 1999-2021 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=6 |
25 |
+EAPI=7 |
26 |
|
27 |
FORTRAN_NEEDED=fortran |
28 |
FORTRAN_STANDARD="77 90" |
29 |
|
30 |
-inherit fortran-2 multilib-minimal multilib flag-o-matic autotools |
31 |
+inherit fortran-2 multilib-minimal flag-o-matic |
32 |
|
33 |
MY_PV=${PV/_/} |
34 |
DESCRIPTION="A high performance and portable MPI implementation" |
35 |
-HOMEPAGE="http://www.mpich.org/" |
36 |
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz" |
37 |
+HOMEPAGE="https://www.mpich.org/" |
38 |
+SRC_URI="https://www.mpich.org/static/downloads/${PV}/${P}.tar.gz" |
39 |
+S="${WORKDIR}"/${PN}-${MY_PV} |
40 |
|
41 |
-SLOT="0" |
42 |
LICENSE="mpich2" |
43 |
+SLOT="0" |
44 |
KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
45 |
IUSE="+cxx doc fortran mpi-threads +romio threads" |
46 |
REQUIRED_USE="mpi-threads? ( threads )" |
47 |
|
48 |
-COMMON_DEPEND=" |
49 |
- >=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}] |
50 |
+COMMON_DEPEND=">=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}] |
51 |
>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}] |
52 |
sys-libs/libunwind[${MULTILIB_USEDEP}] |
53 |
- romio? ( net-fs/nfs-utils ) |
54 |
-" |
55 |
+ romio? ( net-fs/nfs-utils )" |
56 |
|
57 |
DEPEND="${COMMON_DEPEND} |
58 |
dev-lang/perl |
59 |
- sys-devel/libtool |
60 |
-" |
61 |
- |
62 |
+ sys-devel/libtool" |
63 |
RDEPEND="${COMMON_DEPEND} |
64 |
!sys-cluster/mpich2 |
65 |
!sys-cluster/openmpi |
66 |
!sys-cluster/nullmpi" |
67 |
|
68 |
-S="${WORKDIR}"/${PN}-${MY_PV} |
69 |
- |
70 |
MULTILIB_WRAPPED_HEADERS=( |
71 |
/usr/include/mpicxx.h |
72 |
/usr/include/mpi.h |
73 |
@@ -105,10 +100,13 @@ multilib_src_configure() { |
74 |
export MPICHLIB_FCFLAGS="${FCFLAGS}" |
75 |
export MPICHLIB_LDFLAGS="${LDFLAGS}" |
76 |
|
77 |
- # dropped w/ bug #725842 fix |
78 |
+ # Dropped w/ bug #725842 fix |
79 |
#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS |
80 |
|
81 |
# Forcing Bash as there's quite a few bashisms in the build system |
82 |
+ # |
83 |
+ # Note that --with-device=ch3 is preserving the old 3.3.x default |
84 |
+ # - keeping it for compatibility for now. |
85 |
CONFIG_SHELL="${BROOT}/bin/bash" ECONF_SOURCE=${S} econf \ |
86 |
--enable-shared \ |
87 |
--with-hwloc-prefix="${EPREFIX}/usr" \ |
88 |
@@ -119,7 +117,7 @@ multilib_src_configure() { |
89 |
--with-fiprovider-libdir="$(get_libdir)" \ |
90 |
${c} \ |
91 |
--with-pm=hydra \ |
92 |
- --with-device=ch3 \ |
93 |
+ --with-device=ch3 \ |
94 |
--disable-fast \ |
95 |
--enable-versioning \ |
96 |
$(use_enable romio) \ |
97 |
@@ -138,18 +136,18 @@ multilib_src_install() { |
98 |
if use fortran; then |
99 |
if multilib_is_native_abi; then |
100 |
mkdir "${T}"/fortran || die |
101 |
- mv "${ED}"usr/include/mpif* "${T}"/fortran || die |
102 |
- mv "${ED}"usr/include/*.mod "${T}"/fortran || die |
103 |
+ mv "${ED}"/usr/include/mpif* "${T}"/fortran || die |
104 |
+ mv "${ED}"/usr/include/*.mod "${T}"/fortran || die |
105 |
else |
106 |
- rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die |
107 |
+ rm "${ED}"/usr/include/mpif* "${ED}"/usr/include/*.mod || die |
108 |
fi |
109 |
fi |
110 |
} |
111 |
|
112 |
multilib_src_install_all() { |
113 |
- # fortran header cannot be wrapped (bug #540508), workaround part 2 |
114 |
+ # Fortran header cannot be wrapped (bug #540508), workaround part 2 |
115 |
if use fortran; then |
116 |
- mv "${T}"/fortran/* "${ED}"usr/include || die |
117 |
+ mv "${T}"/fortran/* "${ED}"/usr/include || die |
118 |
fi |
119 |
|
120 |
einstalldocs |
121 |
@@ -159,6 +157,6 @@ multilib_src_install_all() { |
122 |
fi |
123 |
|
124 |
if ! use doc; then |
125 |
- rm -rf "${ED}"usr/share/doc/${PF}/www* || die |
126 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/www* || die |
127 |
fi |
128 |
} |