From 70dec9071bd8677b6ad73f44697b4378af032da1 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Fri, 12 Apr 2019 10:16:26 +0200 Subject: [PATCH] OpenMPI: bump (#3761) --- ...nmpi-3.1.2.recipe => openmpi-4.0.1.recipe} | 30 ++-- .../openmpi/patches/openmpi-3.1.2.patchset | 167 ------------------ .../openmpi/patches/openmpi-4.0.1.patchset | 55 ++++++ 3 files changed, 72 insertions(+), 180 deletions(-) rename sys-cluster/openmpi/{openmpi-3.1.2.recipe => openmpi-4.0.1.recipe} (91%) delete mode 100644 sys-cluster/openmpi/patches/openmpi-3.1.2.patchset create mode 100644 sys-cluster/openmpi/patches/openmpi-4.0.1.patchset diff --git a/sys-cluster/openmpi/openmpi-3.1.2.recipe b/sys-cluster/openmpi/openmpi-4.0.1.recipe similarity index 91% rename from sys-cluster/openmpi/openmpi-3.1.2.recipe rename to sys-cluster/openmpi/openmpi-4.0.1.recipe index 11c7ba43f..a1baba9e2 100644 --- a/sys-cluster/openmpi/openmpi-3.1.2.recipe +++ b/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 \ diff --git a/sys-cluster/openmpi/patches/openmpi-3.1.2.patchset b/sys-cluster/openmpi/patches/openmpi-3.1.2.patchset deleted file mode 100644 index f93ac5b7b..000000000 --- a/sys-cluster/openmpi/patches/openmpi-3.1.2.patchset +++ /dev/null @@ -1,167 +0,0 @@ -From 603531fdd45b7e0dcf90334cc7a793973e6a2666 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Mon, 6 Aug 2018 12:09:32 +0200 -Subject: Build fix - - -diff --git a/opal/util/stacktrace.c b/opal/util/stacktrace.c -index e9d8cdb..afb791e 100644 ---- a/opal/util/stacktrace.c -+++ b/opal/util/stacktrace.c -@@ -32,8 +32,12 @@ - #ifdef HAVE_SYS_STAT_H - #include - #endif --#ifdef HAVE_SYS_FCNTL_H -+#ifdef HAVE_FCNTL_H - #include -+#else -+#ifdef HAVE_SYS_FCNTL_H -+#include -+#endif - #endif - - #include --- -2.16.4 - - -From 3f1c57cba66679ffa4a43abedc2f2d6aed998558 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Mon, 6 Aug 2018 12:29:26 +0200 -Subject: Test fix - - -diff --git a/ompi/debuggers/dlopen_test.c b/ompi/debuggers/dlopen_test.c -index 266a1c2..978ca75 100644 ---- a/ompi/debuggers/dlopen_test.c -+++ b/ompi/debuggers/dlopen_test.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - #include "opal/runtime/opal.h" - #include "opal/mca/dl/base/base.h" --- -2.16.4 - - -From 1a2ed6b411e1173af3c87f2d1af09763aafd4419 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Thu, 23 Aug 2018 22:14:41 +0200 -Subject: Haiku got no sys/mount.h - - -diff --git a/test/util/opal_path_nfs.c b/test/util/opal_path_nfs.c -index b5fad7a..40d0dab 100644 ---- a/test/util/opal_path_nfs.c -+++ b/test/util/opal_path_nfs.c -@@ -31,7 +31,9 @@ - #include - - #include -+#ifndef __HAIKU__ - #include -+#endif - #ifdef HAVE_SYS_STATFS_H - #include - #endif --- -2.16.4 - - -From 201133ba37dec47855b83e062472f3f42d14f99a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Wed, 29 Aug 2018 20:51:09 +0200 -Subject: Haiku: user is effective root - - -diff --git a/orte/orted/orted_submit.c b/orte/orted/orted_submit.c -index 9c17400..6d89278 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 -@@ -344,6 +346,7 @@ int orte_submit_init(int argc, char *argv[], - fprintf(stderr, "--------------------------------------------------------------------------\n"); - exit(1); - } -+#endif - - /* process any mca params */ - rc = mca_base_cmd_line_process_args(orte_cmd_line, &environ, &environ); -diff --git a/orte/tools/orte-dvm/orte-dvm.c b/orte/tools/orte-dvm/orte-dvm.c -index 522c539..fbe7e4c 100644 ---- a/orte/tools/orte-dvm/orte-dvm.c -+++ b/orte/tools/orte-dvm/orte-dvm.c -@@ -228,6 +228,8 @@ int main(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 -@@ -253,6 +255,7 @@ int main(int argc, char *argv[]) - fprintf(stderr, "--------------------------------------------------------------------------\n"); - exit(1); - } -+#endif - - /* - * Since this process can now handle MCA/GMCA parameters, make sure to -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, -diff --git a/orte/tools/prun/prun.c b/orte/tools/prun/prun.c -index a8b81df..743026a 100644 ---- a/orte/tools/prun/prun.c -+++ b/orte/tools/prun/prun.c -@@ -302,6 +302,8 @@ int prun(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 -@@ -327,6 +329,7 @@ int prun(int argc, char *argv[]) - fprintf(stderr, "--------------------------------------------------------------------------\n"); - exit(1); - } -+#endif - - /* process any mca params */ - rc = mca_base_cmd_line_process_args(orte_cmd_line, &environ, &environ); --- -2.16.4 - diff --git a/sys-cluster/openmpi/patches/openmpi-4.0.1.patchset b/sys-cluster/openmpi/patches/openmpi-4.0.1.patchset new file mode 100644 index 000000000..194fda165 --- /dev/null +++ b/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?= +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 +