sys-cluster/openmpi/openmpi-3.1.2.recipe → sys-cluster/openmpi/openmpi-4.0.1.recipe

@@ -46,15 +46,16 @@ COPYRIGHT="2004-2010 The Trustees of Indiana University and Indiana \
 	2013-2017 Research Organization for Information Science (RIST)
 	2017 Amazon.com, Inc. or its affiliates"
 LICENSE="BSD (3-clause)"
-REVISION="2"
-SOURCE_URI="https://download.open-mpi.org/release/open-mpi/v3.1/openmpi-$portVersion.tar.bz2"
-CHECKSUM_SHA256="c654ed847f34a278c52a15c98add40402b4a90f0c540779f1ae6c489af8a76c5"
+REVISION="1"
+SOURCE_URI="https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-$portVersion.tar.bz2"
+CHECKSUM_SHA256="cce7b6d20522849301727f81282201d609553103ac0b09162cf28d102efb9709"
 PATCHES="openmpi-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 openmpiLibs="
+	libmca_common_dstore
 	libmca_common_monitoring
 	libmca_common_ompio
 	libmca_common_sm
@@ -66,16 +67,17 @@ openmpiLibs="
 	libopen_pal
 	libopen_rte
 	"
-libmca_common_monitoringVersion=50.0.0
-libmca_common_ompioVersion=41.9.0
-libmca_common_smVersion=40.10.0
-libmpi_mpifhVersion=40.11.2
-libmpi_usempi_ignore_tkrVersion=40.10.1
-libmpi_usempif08Version=40.10.1
-libmpiVersion=40.10.2
-libompitraceVersion=40.10.0
-libopen_palVersion=40.10.2
-libopen_rteVersion=40.10.2
+libmca_common_dstoreVersion=1.0.0
+libmca_common_monitoringVersion=50.10.0
+libmca_common_ompioVersion=41.19.1
+libmca_common_smVersion=40.20.0
+libmpi_mpifhVersion=40.20.1
+libmpi_usempi_ignore_tkrVersion=40.20.0
+libmpi_usempif08Version=40.20.0
+libmpiVersion=40.20.1
+libompitraceVersion=40.20.0
+libopen_palVersion=40.20.1
+libopen_rteVersion=40.20.1
 for i in $openmpiLibs; do
 	eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
 done
@@ -117,6 +119,7 @@ PROVIDES="
 	cmd:orterun = $portVersion
 	cmd:profile2mat.pl = $portVersion
 	cmd:prun = $portVersion
+	lib:libmca_common_dstore$secondaryArchSuffix = $libmca_common_dstoreVersionCompat
 	lib:libmca_common_monitoring$secondaryArchSuffix = $libmca_common_monitoringVersionCompat
 	lib:libmca_common_ompio$secondaryArchSuffix = $libmca_common_ompioVersionCompat
 	lib:libmca_common_sm$secondaryArchSuffix = $libmca_common_smVersionCompat
@@ -179,6 +182,7 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage openmpi$secondaryArchSuffix \
+	"$libDir"/libmca_common_dstore.so.$libmca_common_dstoreVersion \
 	"$libDir"/libmca_common_monitoring.so.$libmca_common_monitoringVersion \
 	"$libDir"/libmca_common_ompio.so.$libmca_common_ompioVersion \
 	"$libDir"/libmca_common_sm.so.$libmca_common_smVersion \

sys-cluster/openmpi/patches/openmpi-4.0.1.patchset

@@ -0,0 +1,55 @@
+From 201133ba37dec47855b83e062472f3f42d14f99a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 29 Aug 2018 20:51:09 +0200
+Subject: Haiku: user is effective root
+
+---
+ orte/orted/orted_submit.c    | 3 +++
+ orte/tools/orterun/orterun.c | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/orte/orted/orted_submit.c b/orte/orted/orted_submit.c
+index ccc089e..4f4905e 100644
+--- a/orte/orted/orted_submit.c
++++ b/orte/orted/orted_submit.c
+@@ -319,6 +319,8 @@ int orte_submit_init(int argc, char *argv[],
+         exit(0);
+     }
+
++#ifndef __HAIKU__
++/* User is effective root on Haiku */
+     /* check if we are running as root - if we are, then only allow
+      * us to proceed if the allow-run-as-root flag was given. Otherwise,
+      * exit with a giant warning flag
+@@ -355,6 +357,7 @@ int orte_submit_init(int argc, char *argv[],
+         fprintf(stderr, "--------------------------------------------------------------------------\n");
+         exit(1);
+     }
++#endif
+
+   moveon:
+     /* process any mca params */
+diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c
+index 85aba0a..34351ef 100644
+--- a/orte/tools/orterun/orterun.c
++++ b/orte/tools/orterun/orterun.c
+@@ -138,6 +138,8 @@ int orterun(int argc, char *argv[])
+         exit(1);
+     }
+
++#ifndef __HAIKU__
++/* User is effective root on Haiku */
+     /* check if we are running as root - if we are, then only allow
+      * us to proceed if the allow-run-as-root flag was given. Otherwise,
+      * exit with a giant warning flag
+@@ -159,6 +161,7 @@ int orterun(int argc, char *argv[])
+         fprintf(stderr, "--------------------------------------------------------------------------\n");
+         exit(1);
+     }
++#endif
+
+     /* setup to listen for commands sent specifically to me, even though I would probably
+      * be the one sending them! Unfortunately, since I am a participating daemon,
+-- 
+2.21.0
+