Skip to content

Commit 82240f5

Browse files
author
rhc54
authored
Merge pull request #1952 from rhc54/topic/pmixcov
Update to latest PMIx toolext branch
2 parents 8d0baf1 + 73544d2 commit 82240f5

File tree

214 files changed

+24486
-5878
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+24486
-5878
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,12 @@ opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h
305305
opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h.in
306306
opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in
307307
opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
308+
opal/mca/hwloc/base/static-components.h.new.extern
309+
opal/mca/hwloc/base/static-components.h.new.struct
310+
opal/mca/pmix/pmix2x/pmix/src/include/frameworks.h
311+
opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
312+
opal/mca/pmix/pmix2x/pmix/config/autogen_found_items.m4
313+
opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h
308314

309315
opal/tools/opal-checkpoint/opal-checkpoint
310316
opal/tools/opal-checkpoint/opal-checkpoint.1

opal/mca/pmix/ext20/configure.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ AC_DEFUN([MCA_opal_pmix_ext20_CONFIG],[
6666
OPAL_CHECK_PACKAGE([opal_pmix_ext20],
6767
[pmix.h],
6868
[pmix],
69-
[PMIx_Query_info],
69+
[PMIx_Query_info_nb],
7070
[-lpmix],
7171
[$pmix_ext_install_dir],
7272
[$pmix_ext_install_dir/lib],

0 commit comments

Comments
 (0)