[gentoo-commits] repo/gentoo:master commit in: sys-cluster/openmpi/files/

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/openmpi/files/

[David Seifert]

commit:     9ad77cd914255ff74a3fb0070a534f55fb28df4f
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 15:56:06 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 22:33:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad77cd9

sys-cluster/openmpi: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3900

 .../openmpi/files/openmpi-1.4.1-r22513.patch       | 72 ----------------------
 .../openmpi/files/openmpi-1.6-hostfile.patch       | 16 -----
 sys-cluster/openmpi/files/openmpi-r24328.patch     | 54 ----------------
 3 files changed, 142 deletions(-)

diff --git a/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch b/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch
deleted file mode 100644
index 128443be5f..0000000000
--- a/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 9657a0fc671dd0987b6954932a08b680c35f480f Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Wed, 3 Feb 2010 17:13:13 -0500
-Subject: [PATCH] Backport r22513
-
-Per #2201, move the user arguments up to be the first set of argv
-after the compiler argv tokens.
-
-Not closing #2201 yet; there's still discussion on that ticket about
-whether we want to do more or not.
-
-Refs #2201
-cmr:v1.4.2
-cmr:v1.5
-
-Author: jsquyres
----
- ompi/tools/wrappers/ompi_wrapper_script.in |    4 +++-
- opal/tools/wrappers/opal_wrapper.c         |    9 +++++----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/ompi/tools/wrappers/ompi_wrapper_script.in b/ompi/tools/wrappers/ompi_wrapper_script.in
-index 24726ad..87fd8a5 100644
---- a/ompi/tools/wrappers/ompi_wrapper_script.in
-+++ b/ompi/tools/wrappers/ompi_wrapper_script.in
-@@ -140,13 +140,15 @@ my @exec_argv = ();
- 
- # assemble command
- push(@exec_argv, split(' ', $comp));
-+# Per https://svn.open-mpi.org/trac/ompi/ticket/2201, add all the user
-+# arguments before anything else.
-+push(@exec_argv, @appargs);
- if ($want_preproc == 1) {
-     push(@exec_argv, split(' ', $preproc_flags));
- }
- if ($want_compile == 1) {
-     push(@exec_argv, split(' ', $comp_flags));
- }
--push(@exec_argv, @appargs);
- if ($want_link == 1) {
-     push(@exec_argv, split(' ', $linker_flags));
-     push(@exec_argv, split(' ', $libs));
-diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c
-index 86ece5b..1b80f53 100644
---- a/opal/tools/wrappers/opal_wrapper.c
-+++ b/opal/tools/wrappers/opal_wrapper.c
-@@ -712,6 +712,11 @@ main(int argc, char *argv[])
-         exec_argc = 0;
-     }
- 
-+    /* Per https://svn.open-mpi.org/trac/ompi/ticket/2201, add all the
-+       user arguments before anything else. */
-+    opal_argv_insert(&exec_argv, exec_argc, user_argv);
-+    exec_argc = opal_argv_count(exec_argv);
-+
-     /* preproc flags */
-     if (flags & COMP_WANT_PREPROC) {
-         opal_argv_insert(&exec_argv, exec_argc, options_data[user_data_idx].preproc_flags);
-@@ -732,10 +737,6 @@ main(int argc, char *argv[])
-         exec_argc = opal_argv_count(exec_argv);
-     }
- 
--    /* add all the user arguments */
--    opal_argv_insert(&exec_argv, exec_argc, user_argv);
--    exec_argc = opal_argv_count(exec_argv);
--
-     /* link flags and libs */
-     if (flags & COMP_WANT_LINK) {
-         opal_argv_insert(&exec_argv, exec_argc, options_data[user_data_idx].link_flags);
--- 
-1.6.4.4
-

diff --git a/sys-cluster/openmpi/files/openmpi-1.6-hostfile.patch b/sys-cluster/openmpi/files/openmpi-1.6-hostfile.patch
deleted file mode 100644
index 880c429261..0000000000
--- a/sys-cluster/openmpi/files/openmpi-1.6-hostfile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix default hostfile location (backported r26440)
-
-https://bugs.gentoo.org/show_bug.cgi?id=420431
-
-Patch by Orion Poplawski <orion AT SPAMFREE cora DOT nwra DOT com>
---- a/orte/runtime/orte_mca_params.c
-+++ b/orte/runtime/orte_mca_params.c
-@@ -225,7 +225,7 @@ int orte_register_params(void)
-                                 false, false, 1000, &orte_timeout_usec_per_proc);
-     
-     /* default hostfile */
--    asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
-+    asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
-     mca_base_param_reg_string_name("orte", "default_hostfile",
-                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
-                                    false, false, orte_default_hostfile, &orte_default_hostfile);

diff --git a/sys-cluster/openmpi/files/openmpi-r24328.patch b/sys-cluster/openmpi/files/openmpi-r24328.patch
deleted file mode 100644
index bbd689d3ae..0000000000
--- a/sys-cluster/openmpi/files/openmpi-r24328.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cf054cd92dfac55f3920e805d01c11dcfc2cd4fa Mon Sep 17 00:00:00 2001
-From: jsquyres <jsquyres@cisco.com>
-Date: Mon, 28 Mar 2011 12:44:06 -0400
-Subject: [PATCH] Fix some fairly-important typos (!)
-
-Upstream commit r24328.
----
- test/datatype/ddt_lib.c      |    2 +-
- test/datatype/ddt_raw.c      |    2 +-
- test/datatype/opal_ddt_lib.c |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/datatype/ddt_lib.c b/test/datatype/ddt_lib.c
-index 015419d..c349384 100644
---- a/test/datatype/ddt_lib.c
-+++ b/test/datatype/ddt_lib.c
-@@ -209,7 +209,7 @@ int mpich_typeub2( void )
- 
- int mpich_typeub3( void )
- {
--   int blocklen[2], err = 0, idisp[3];
-+   int blocklen[3], err = 0, idisp[3];
-    size_t sz;
-    MPI_Aint disp[3], lb, ub, ex;
-    ompi_datatype_t *types[3], *dt1, *dt2, *dt3, *dt4, *dt5;
-diff --git a/test/datatype/ddt_raw.c b/test/datatype/ddt_raw.c
-index eea9004..7effe65 100644
---- a/test/datatype/ddt_raw.c
-+++ b/test/datatype/ddt_raw.c
-@@ -45,7 +45,7 @@ static int test_upper( unsigned int length )
- {
-     ompi_datatype_t *pdt;
-     opal_convertor_t * pConv;
--    int rc;
-+    int rc = OMPI_SUCCESS;
-     unsigned int i, iov_count, split_chunk, total_length;
-     size_t max_data;
-     struct iovec iov[5];
-diff --git a/test/datatype/opal_ddt_lib.c b/test/datatype/opal_ddt_lib.c
-index e05bb06..dffd86c 100644
---- a/test/datatype/opal_ddt_lib.c
-+++ b/test/datatype/opal_ddt_lib.c
-@@ -759,7 +759,7 @@ int mpich_typeub2( void )
- 
- int mpich_typeub3( void )
- {
--   int blocklen[2], err = 0, idisp[3];
-+   int blocklen[3], err = 0, idisp[3];
-    size_t sz;
-    OPAL_PTRDIFF_TYPE disp[3], lb, ub, ex;
-    opal_datatype_t *types[3], *dt1, *dt2, *dt3, *dt4, *dt5;
--- 
-1.7.3.4
-

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/openmpi/files/

[Jakov Smolić]

commit:     9ec2fda0de0eaa6e4275498f5be54678cc4292ea
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Nov  5 15:30:47 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Nov  6 09:30:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec2fda0

sys-cluster/openmpi: remove unused patch

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22831
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 ...le-malloc-override-inside-of-Gentoo-sandb.patch | 42 ----------------------
 1 file changed, 42 deletions(-)

diff --git a/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch b/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
deleted file mode 100644
index 197430aee6f..00000000000
--- a/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3bd5897c7ca8ab61fb024957aeae891e204b3e3f Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 1 Jul 2013 20:37:17 -0400
-Subject: [PATCH] hooks:  disable malloc override inside of Gentoo sandbox
-
-As described in the comments in the source, Gentoo's own version of
-fakeroot, sandbox, also runs into hangs when malloc is overridden.
-Sandbox environments can easily be detected by looking for SANDBOX_PID
-in the environment.  When detected, employ the same fix used for
-fakeroot.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=462602
----
- opal/mca/memory/linux/hooks.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/opal/mca/memory/linux/hooks.c b/opal/mca/memory/linux/hooks.c
-index 6a1646f..5ded08c 100644
---- a/opal/mca/memory/linux/hooks.c
-+++ b/opal/mca/memory/linux/hooks.c
-@@ -747,9 +747,16 @@ static void opal_memory_linux_malloc_init_hook(void)
-        "fakeroot" build environment that allocates memory during
-        stat() (see http://bugs.debian.org/531522).  It may not be
-        necessary any more since we're using access(), not stat().  But
--       we'll leave the check, anyway. */
-+       we'll leave the check, anyway.
-+
-+       This is also an issue when using Gentoo's version of 'fakeroot',
-+       sandbox v2.5.  Sandbox environments can also be detected fairly
-+       easily by looking for SANDBOX_ON.
-+    */
-+
-     if (getenv("FAKEROOTKEY") != NULL ||
--        getenv("FAKED_MODE") != NULL) {
-+        getenv("FAKED_MODE") != NULL ||
-+        getenv("SANDBOX_ON") != NULL ) {
-         return;
-     }
- 
--- 
-1.8.1.5
-