1 |
commit: 2273e31dabc5ca216d1ca8e7c68406b0ad3e5ab6 |
2 |
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 19 21:09:04 2020 +0000 |
4 |
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 19 21:09:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2273e31d |
7 |
|
8 |
app-shells/mpibash: fix build with mpi-3 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/656422 |
11 |
Closes: https://bugs.gentoo.org/708994 |
12 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
13 |
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org> |
14 |
|
15 |
app-shells/mpibash/Manifest | 1 - |
16 |
app-shells/mpibash/files/mpi-3.patch | 24 +++++++++++++ |
17 |
app-shells/mpibash/mpibash-1.2.ebuild | 42 ---------------------- |
18 |
.../{mpibash-1.3.ebuild => mpibash-1.3-r1.ebuild} | 8 +++-- |
19 |
app-shells/mpibash/mpibash-9999.ebuild | 6 ++-- |
20 |
5 files changed, 32 insertions(+), 49 deletions(-) |
21 |
|
22 |
diff --git a/app-shells/mpibash/Manifest b/app-shells/mpibash/Manifest |
23 |
index 38d74257f4f..b1d1faba492 100644 |
24 |
--- a/app-shells/mpibash/Manifest |
25 |
+++ b/app-shells/mpibash/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST mpibash-1.2.tar.gz 347083 BLAKE2B 75b79d8e1f418de8220ff502245bc094774984f4760d922297a2ad2fcdb7d87a4a5d28015fd2686fbc68939ac532551046f8a987166accaa8b96025cce9fc79e SHA512 db755dd2c6212a8d7dfd6cbff17d5dffcbc3b6a0286abdad4d2e21790453d2356e88c566abe4648da138d6964098fad581b8fd5beae1335f5787de92f4659104 |
28 |
DIST mpibash-1.3.tar.gz 369803 BLAKE2B b1959deaa2d5b3bce1a66e5ef0ff41ad156093aec9cc1efcd12873b6d5814ad1586ff951d6fd7f37dab6a55040378774b435edc4e2c8892952480539864f91fa SHA512 4728565239aae80013322231a928fd1e9a59484614a92cf7e314d0cd5c090d3a47de395507ce52f71a6900245855089d659c6509f8c4df3bfd88e46fc2187749 |
29 |
|
30 |
diff --git a/app-shells/mpibash/files/mpi-3.patch b/app-shells/mpibash/files/mpi-3.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..7b7e1ec820d |
33 |
--- /dev/null |
34 |
+++ b/app-shells/mpibash/files/mpi-3.patch |
35 |
@@ -0,0 +1,24 @@ |
36 |
+From 0b396b62ac314ae509ac3ca5fa9d5119e862be51 Mon Sep 17 00:00:00 2001 |
37 |
+From: Scott Pakin <pakin@××××.gov> |
38 |
+Date: Wed, 19 Feb 2020 13:43:40 -0700 |
39 |
+Subject: [PATCH] Replace deprecated MPI_Errhandler_set with newer |
40 |
+ MPI_Comm_set_errhandler |
41 |
+ |
42 |
+Resolves #17. |
43 |
+--- |
44 |
+ src/init.c | 2 +- |
45 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
46 |
+ |
47 |
+diff --git a/src/init.c b/src/init.c |
48 |
+index cd070a7..46b1127 100644 |
49 |
+--- a/src/init.c |
50 |
++++ b/src/init.c |
51 |
+@@ -77,7 +77,7 @@ mpi_init_builtin (WORD_LIST *list) |
52 |
+ |
53 |
+ /* Make MPI errors return instead of crash. Also, store our rank |
54 |
+ * and number of ranks. */ |
55 |
+- MPI_Errhandler_set (MPI_COMM_WORLD, MPI_ERRORS_RETURN); |
56 |
++ MPI_Comm_set_errhandler (MPI_COMM_WORLD, MPI_ERRORS_RETURN); |
57 |
+ MPI_Comm_rank (MPI_COMM_WORLD, &mpibash_rank); |
58 |
+ MPI_Comm_size (MPI_COMM_WORLD, &mpibash_num_ranks); |
59 |
+ |
60 |
|
61 |
diff --git a/app-shells/mpibash/mpibash-1.2.ebuild b/app-shells/mpibash/mpibash-1.2.ebuild |
62 |
deleted file mode 100644 |
63 |
index 594ac6bc88c..00000000000 |
64 |
--- a/app-shells/mpibash/mpibash-1.2.ebuild |
65 |
+++ /dev/null |
66 |
@@ -1,42 +0,0 @@ |
67 |
-# Copyright 1999-2017 Gentoo Foundation |
68 |
-# Distributed under the terms of the GNU General Public License v2 |
69 |
- |
70 |
-EAPI=5 |
71 |
- |
72 |
-inherit autotools-utils multilib |
73 |
- |
74 |
-if [[ ${PV} = 9999 ]]; then |
75 |
- EGIT_REPO_URI="https://github.com/lanl/MPI-Bash.git" |
76 |
- inherit git-r3 |
77 |
- KEYWORDS="" |
78 |
- AUTOTOOLS_AUTORECONF=1 |
79 |
-else |
80 |
- SRC_URI="https://github.com/lanl/MPI-Bash/releases/download/v${PV}/${P}.tar.gz" |
81 |
- KEYWORDS="~amd64" |
82 |
-fi |
83 |
- |
84 |
-DESCRIPTION="Parallel scripting right from the Bourne-Again Shell (Bash)" |
85 |
-HOMEPAGE="https://github.com/lanl/MPI-Bash" |
86 |
- |
87 |
-LICENSE="GPL-3" |
88 |
-SLOT="0" |
89 |
-IUSE="examples" |
90 |
- |
91 |
-DEPEND="virtual/mpi |
92 |
- >=app-shells/bash-4.2[plugins] |
93 |
- sys-cluster/libcircle" |
94 |
-RDEPEND="${DEPEND}" |
95 |
- |
96 |
-src_configure() { |
97 |
- local myeconfargs=( |
98 |
- --with-bashdir="${EPREFIX}"/usr/include/bash-plugins |
99 |
- --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash |
100 |
- ) |
101 |
- autotools-utils_src_configure |
102 |
-} |
103 |
- |
104 |
-src_install() { |
105 |
- autotools-utils_src_install |
106 |
- sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die |
107 |
- use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die |
108 |
-} |
109 |
|
110 |
diff --git a/app-shells/mpibash/mpibash-1.3.ebuild b/app-shells/mpibash/mpibash-1.3-r1.ebuild |
111 |
similarity index 88% |
112 |
rename from app-shells/mpibash/mpibash-1.3.ebuild |
113 |
rename to app-shells/mpibash/mpibash-1.3-r1.ebuild |
114 |
index 76bbce43cda..fcb33db81ee 100644 |
115 |
--- a/app-shells/mpibash/mpibash-1.3.ebuild |
116 |
+++ b/app-shells/mpibash/mpibash-1.3-r1.ebuild |
117 |
@@ -1,7 +1,7 @@ |
118 |
-# Copyright 1999-2017 Gentoo Foundation |
119 |
+# Copyright 1999-2020 Gentoo Authors |
120 |
# Distributed under the terms of the GNU General Public License v2 |
121 |
|
122 |
-EAPI=5 |
123 |
+EAPI=7 |
124 |
|
125 |
inherit autotools multilib |
126 |
|
127 |
@@ -22,10 +22,12 @@ SLOT="0" |
128 |
IUSE="examples" |
129 |
|
130 |
DEPEND="virtual/mpi |
131 |
- >=app-shells/bash-4.2[plugins] |
132 |
+ >=app-shells/bash-4.2:0[plugins] |
133 |
sys-cluster/libcircle" |
134 |
RDEPEND="${DEPEND}" |
135 |
|
136 |
+PATCHES=( "${FILESDIR}/mpi-3.patch" ) |
137 |
+ |
138 |
src_prepare() { |
139 |
default |
140 |
[[ ${PV} != 9999 ]] || eautoreconf |
141 |
|
142 |
diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-9999.ebuild |
143 |
index 76bbce43cda..5832bd90df0 100644 |
144 |
--- a/app-shells/mpibash/mpibash-9999.ebuild |
145 |
+++ b/app-shells/mpibash/mpibash-9999.ebuild |
146 |
@@ -1,7 +1,7 @@ |
147 |
-# Copyright 1999-2017 Gentoo Foundation |
148 |
+# Copyright 1999-2020 Gentoo Authors |
149 |
# Distributed under the terms of the GNU General Public License v2 |
150 |
|
151 |
-EAPI=5 |
152 |
+EAPI=7 |
153 |
|
154 |
inherit autotools multilib |
155 |
|
156 |
@@ -22,7 +22,7 @@ SLOT="0" |
157 |
IUSE="examples" |
158 |
|
159 |
DEPEND="virtual/mpi |
160 |
- >=app-shells/bash-4.2[plugins] |
161 |
+ >=app-shells/bash-4.2:0[plugins] |
162 |
sys-cluster/libcircle" |
163 |
RDEPEND="${DEPEND}" |