OpenMPI: disable root check (#2973)

This commit is contained in:
miqlas
2018-09-01 18:05:20 +02:00
committed by GitHub
parent 2c932ba5f8
commit 52b5d3735a
2 changed files with 98 additions and 4 deletions

View File

@@ -46,7 +46,7 @@ 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="1"
REVISION="2"
SOURCE_URI="https://download.open-mpi.org/release/open-mpi/v3.1/openmpi-$portVersion.tar.bz2"
CHECKSUM_SHA256="c654ed847f34a278c52a15c98add40402b4a90f0c540779f1ae6c489af8a76c5"
PATCHES="openmpi-$portVersion.patchset"

View File

@@ -1,4 +1,4 @@
From 89a9383bcffd979ab9f21c1f8bc553cd4f1574df Mon Sep 17 00:00:00 2001
From 603531fdd45b7e0dcf90334cc7a793973e6a2666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 6 Aug 2018 12:09:32 +0200
Subject: Build fix
@@ -26,7 +26,7 @@ index e9d8cdb..afb791e 100644
2.16.4
From dba6b864266345b2f63b93e27d0194a4c3566d48 Mon Sep 17 00:00:00 2001
From 3f1c57cba66679ffa4a43abedc2f2d6aed998558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 6 Aug 2018 12:29:26 +0200
Subject: Test fix
@@ -48,7 +48,7 @@ index 266a1c2..978ca75 100644
2.16.4
From b81ac9aa68e035bcd7fe3c807e7673e2c147c0f3 Mon Sep 17 00:00:00 2001
From 1a2ed6b411e1173af3c87f2d1af09763aafd4419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 23 Aug 2018 22:14:41 +0200
Subject: Haiku got no sys/mount.h
@@ -71,3 +71,97 @@ index b5fad7a..40d0dab 100644
--
2.16.4
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
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