diff options
| author | 健美猫 <weijianwen@gmail.com> | 2017-02-01 03:52:38 +0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-01-31 14:52:38 -0500 |
| commit | a08ccbedeede499a568c5c818579320ab41247c4 (patch) | |
| tree | 186d44551e40f45ac6592261a9ca4a45229a8eae /var | |
| parent | 8275b4471556c3b55bbac75cea748c0496007eb4 (diff) | |
| download | spack-a08ccbedeede499a568c5c818579320ab41247c4.tar.gz spack-a08ccbedeede499a568c5c818579320ab41247c4.tar.bz2 spack-a08ccbedeede499a568c5c818579320ab41247c4.tar.xz spack-a08ccbedeede499a568c5c818579320ab41247c4.zip | |
Patch OpenMPI 2.0.x to fix pmi_opcaddy_t_class issue. (#2962)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openmpi/fix_multidef_pmi_class.patch | 54 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/openmpi/package.py | 1 |
2 files changed, 55 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openmpi/fix_multidef_pmi_class.patch b/var/spack/repos/builtin/packages/openmpi/fix_multidef_pmi_class.patch new file mode 100644 index 0000000000..28ebd9aeca --- /dev/null +++ b/var/spack/repos/builtin/packages/openmpi/fix_multidef_pmi_class.patch @@ -0,0 +1,54 @@ +diff -Naur openmpi-2.0.1.orig/opal/mca/pmix/cray/pmix_cray.c openmpi-2.0.1/opal/mca/pmix/cray/pmix_cray.c +--- openmpi-2.0.1.orig/opal/mca/pmix/cray/pmix_cray.c 2016-08-23 04:56:37.000000000 +0800 ++++ openmpi-2.0.1/opal/mca/pmix/cray/pmix_cray.c 2017-01-31 01:05:34.302807465 +0800 +@@ -6,7 +6,7 @@ + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All + * rights reserved. + * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. +- * Copyright (c) 2014-2015 Research Organization for Information Science ++ * Copyright (c) 2014-2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * +@@ -127,7 +127,7 @@ + opal_pmix_op_cbfunc_t opcbfunc; + void *cbdata; + } pmi_opcaddy_t; +-OBJ_CLASS_INSTANCE(pmi_opcaddy_t, ++static OBJ_CLASS_INSTANCE(pmi_opcaddy_t, + opal_object_t, + NULL, NULL); + +diff -Naur openmpi-2.0.1.orig/opal/mca/pmix/s1/pmix_s1.c openmpi-2.0.1/opal/mca/pmix/s1/pmix_s1.c +--- openmpi-2.0.1.orig/opal/mca/pmix/s1/pmix_s1.c 2016-08-23 04:56:37.000000000 +0800 ++++ openmpi-2.0.1/opal/mca/pmix/s1/pmix_s1.c 2017-01-31 01:06:08.014808847 +0800 +@@ -1,7 +1,7 @@ + /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ + /* + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. +- * Copyright (c) 2014-2015 Research Organization for Information Science ++ * Copyright (c) 2014-2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * +@@ -88,7 +88,7 @@ + opal_pmix_op_cbfunc_t opcbfunc; + void *cbdata; + } pmi_opcaddy_t; +-OBJ_CLASS_INSTANCE(pmi_opcaddy_t, ++static OBJ_CLASS_INSTANCE(pmi_opcaddy_t, + opal_object_t, + NULL, NULL); + +diff -Naur openmpi-2.0.1.orig/opal/mca/pmix/s2/pmix_s2.c openmpi-2.0.1/opal/mca/pmix/s2/pmix_s2.c +--- openmpi-2.0.1.orig/opal/mca/pmix/s2/pmix_s2.c 2016-08-23 04:56:37.000000000 +0800 ++++ openmpi-2.0.1/opal/mca/pmix/s2/pmix_s2.c 2017-01-31 01:06:27.718809655 +0800 +@@ -95,7 +95,7 @@ + opal_pmix_op_cbfunc_t opcbfunc; + void *cbdata; + } pmi_opcaddy_t; +-OBJ_CLASS_INSTANCE(pmi_opcaddy_t, ++static OBJ_CLASS_INSTANCE(pmi_opcaddy_t, + opal_object_t, + NULL, NULL); + diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index bf844b7459..3740923cf0 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -75,6 +75,7 @@ class Openmpi(AutotoolsPackage): patch('ad_lustre_rwcontig_open_source.patch', when="@1.6.5") patch('llnl-platforms.patch', when="@1.6.5") patch('configure.patch', when="@1.10.0:1.10.1") + patch('fix_multidef_pmi_class.patch', when="@2.0.0:2.0.1") # Fabrics variant('psm', default=False, description='Build support for the PSM library') |