Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 58b0ddd

Browse files
authored
Merge pull request #1336 from ggouaillardet/topic/v2.x/pmix_sec_native
v2.x: fix sec/native module under Solaris and other misc issues
2 parents fa10731 + 0bd1495 commit 58b0ddd

File tree

5 files changed

+34
-662
lines changed

5 files changed

+34
-662
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ opal/mca/hwloc/hwloc*/hwloc/include/private/autogen/config.h
301301
opal/mca/installdirs/config/install_dirs.h
302302

303303
opal/mca/pmix/pmix112/pmix/include/pmix/autogen/config.h
304+
opal/mca/pmix/pmix112/pmix/include/pmix/autogen/config.h.in
304305
opal/mca/pmix/pmix112/pmix/include/pmix/pmix_common.h
305306
opal/mca/pmix/pmix112/pmix/include/private/autogen/config.h
306307
opal/mca/pmix/pmix112/pmix/include/private/autogen/config.h.in

opal/mca/pmix/pmix112/pmix/config/pmix.m4

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dnl reserved.
1818
dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved.
1919
dnl Copyright (c) 2011-2013 NVIDIA Corporation. All rights reserved.
2020
dnl Copyright (c) 2013-2015 Intel, Inc. All rights reserved
21-
dnl Copyright (c) 2015 Research Organization for Information Science
21+
dnl Copyright (c) 2015-2016 Research Organization for Information Science
2222
dnl and Technology (RIST). All rights reserved.
2323
dnl Copyright (c) 2016 Mellanox Technologies, Inc.
2424
dnl All rights reserved.
@@ -318,7 +318,8 @@ AC_DEFUN([PMIX_SETUP_CORE],[
318318
sys/wait.h syslog.h \
319319
time.h unistd.h \
320320
crt_externs.h signal.h \
321-
ioLib.h sockLib.h hostLib.h limits.h])
321+
ioLib.h sockLib.h hostLib.h limits.h \
322+
ucred.h])
322323

323324
# Note that sometimes we have <stdbool.h>, but it doesn't work (e.g.,
324325
# have both Portland and GNU installed; using pgcc will find GNU's
@@ -495,7 +496,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
495496
# Darwin doesn't need -lm, as it's a symlink to libSystem.dylib
496497
PMIX_SEARCH_LIBS_CORE([ceil], [m])
497498

498-
AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep getpeereid])
499+
AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep getpeereid getpeerucred])
499500

500501
# On some hosts, htonl is a define, so the AC_CHECK_FUNC will get
501502
# confused. On others, it's in the standard library, but stubbed with

0 commit comments

Comments
 (0)