Skip to content

Commit 0818181

Browse files
rhc54rhc54
committed
Update OAC submodule
Remove the PMIx "os_flavors" m4 in favor of the new OAC version. Signed-off-by: Ralph Castain <[email protected]>
1 parent 7d0b9ab commit 0818181

File tree

11 files changed

+46
-107
lines changed

11 files changed

+46
-107
lines changed

‎config/oac

‎config/pmix.m4

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,17 @@ AC_DEFUN([PMIX_SETUP_CORE],[
264264
AC_CHECK_TYPES(uintptr_t)
265265
AC_CHECK_TYPES(ptrdiff_t)
266266

267+
# check for sockaddr_in (a good sign we have TCP)
268+
# results used in the pif framework
269+
AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h])
270+
AC_CHECK_TYPES([struct sockaddr_in],
271+
[pmix_found_sockaddr=yes],
272+
[pmix_found_sockaddr=no],
273+
[AC_INCLUDES_DEFAULT
274+
#ifdef HAVE_NETINET_IN_H
275+
#include <netinet/in.h>
276+
#endif])
277+
267278
#
268279
# Check for type sizes
269280
#
@@ -1051,7 +1062,7 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
10511062
#
10521063
# Check the OS flavor here
10531064
#
1054-
PMIX_CHECK_OS_FLAVORS
1065+
OAC_CHECK_OS_FLAVORS
10551066

10561067
#
10571068
# Developer picky compiler options

‎config/pmix_check_os_flavors.m4

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎src/include/pmix_config_bottom.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
**********************************************************************/
5555

5656
/* Do we have posix or solaris thread lib */
57-
#define PMIX_HAVE_THREADS (PMIX_HAVE_POSIX_THREADS || PMIX_HAVE_SOLARIS_THREADS)
57+
#define PMIX_HAVE_THREADS (PMIX_HAVE_POSIX_THREADS || OAC_HAVE_SOLARIS_THREADS)
5858

5959
/*
6060
* BEGIN_C_DECLS should be used at the beginning of your declarations,
@@ -187,7 +187,7 @@
187187
#endif
188188

189189
#if PMIX_HAVE_ATTRIBUTE_FORMAT
190-
#if PMIX_HAVE_SOLARIS
190+
#if OAC_HAVE_SOLARIS
191191
# define __pmix_attribute_format__(a, b, c)
192192
#else
193193
# define __pmix_attribute_format__(a, b, c) __attribute__((__format__(a, b, c)))
@@ -300,7 +300,7 @@
300300
#endif
301301

302302
#if PMIX_HAVE_ATTRIBUTE_SENTINEL
303-
#if PMIX_HAVE_SOLARIS
303+
#if OAC_HAVE_SOLARIS
304304
# define __pmix_attribute_sentinel__
305305
#else
306306
# define __pmix_attribute_sentinel__ __attribute__((__sentinel__))

‎src/mca/pif/bsdx_ipv4/configure.m4

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Copyright (c) 2015 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
66
# Copyright (c) 2016 Intel, Inc. All rights reserved.
7+
# Copyright (c) 2023 Nanook Consulting. All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -23,7 +24,7 @@ AC_DEFUN([MCA_pmix_pif_bsdx_ipv4_COMPILE_MODE], [
2324
AC_DEFUN([MCA_pmix_pif_bsdx_ipv4_CONFIG], [
2425
AC_CONFIG_FILES([src/mca/pif/bsdx_ipv4/Makefile])
2526

26-
AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
27+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2728

2829
# If we found struct sockaddr and we're on any of the BSDs, we're
2930
# happy. I.e., this:
@@ -32,11 +33,12 @@ AC_DEFUN([MCA_pmix_pif_bsdx_ipv4_CONFIG], [
3233
AC_MSG_CHECKING([struct sockaddr])
3334
AS_IF([test "$pmix_found_sockaddr" = "yes"],
3435
[AC_MSG_RESULT([yes (cached)])
35-
AC_MSG_CHECKING([NetBSD, FreeBSD, OpenBSD, or DragonFly])
36-
AS_IF([test "$pmix_found_netbsd" = "yes" || \
37-
test "$pmix_found_freebsd" = "yes" || \
38-
test "$pmix_found_openbsd" = "yes" || \
39-
test "$pmix_found_dragonfly" = "yes"],
36+
AC_MSG_CHECKING([NetBSD, FreeBSD, OpenBSD, Apple, or DragonFly])
37+
AS_IF([test "$oac_found_netbsd" = "yes" || \
38+
test "$oac_found_freebsd" = "yes" || \
39+
test "$oac_found_openbsd" = "yes" || \
40+
test "$oac_found_dragonfly" = "yes" ||
41+
test "$oac_found_apple" = "yes"],
4042
[AC_MSG_RESULT([yes])
4143
$1],
4244
[AC_MSG_RESULT([no])

‎src/mca/pif/bsdx_ipv6/configure.m4

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Copyright (c) 2015 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
66
# Copyright (c) 2016 Intel, Inc. All rights reserved.
7+
# Copyright (c) 2023 Nanook Consulting. All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -23,7 +24,7 @@ AC_DEFUN([MCA_pmix_pif_bsdx_ipv6_COMPILE_MODE], [
2324
AC_DEFUN([MCA_pmix_pif_bsdx_ipv6_CONFIG], [
2425
AC_CONFIG_FILES([src/mca/pif/bsdx_ipv6/Makefile])
2526

26-
AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
27+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2728

2829
# If we found struct sockaddr and we're on any of the BSDs, we're
2930
# happy. I.e., this:
@@ -33,12 +34,12 @@ AC_DEFUN([MCA_pmix_pif_bsdx_ipv6_CONFIG], [
3334
AS_IF([test "$pmix_found_sockaddr" = "yes"],
3435
[AC_MSG_RESULT([yes (cached)])
3536
AC_MSG_CHECKING([some flavor of BSD])
36-
AS_IF([test "$pmix_found_netbsd" = "yes" || \
37-
test "$pmix_found_freebsd" = "yes" || \
38-
test "$pmix_found_openbsd" = "yes" || \
39-
test "$pmix_found_386bsd" = "yes" || \
40-
test "$pmix_found_bsdi" = "yes" ||
41-
test "$pmix_found_apple" = "yes"],
37+
AS_IF([test "$oac_found_netbsd" = "yes" || \
38+
test "$oac_found_freebsd" = "yes" || \
39+
test "$oac_found_openbsd" = "yes" || \
40+
test "$oac_found_386bsd" = "yes" || \
41+
test "$oac_found_bsdi" = "yes" ||
42+
test "$oac_found_apple" = "yes"],
4243
[AC_MSG_RESULT([yes])
4344
$1],
4445
[AC_MSG_RESULT([no])

‎src/mca/pif/linux_ipv6/configure.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Copyright (c) 2015 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
66
# Copyright (c) 2016 Intel, Inc. All rights reserved.
7+
# Copyright (c) 2023 Nanook Consulting. All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -23,7 +24,7 @@ AC_DEFUN([MCA_pmix_pif_linux_ipv6_COMPILE_MODE], [
2324
AC_DEFUN([MCA_pmix_pif_linux_ipv6_CONFIG], [
2425
AC_CONFIG_FILES([src/mca/pif/linux_ipv6/Makefile])
2526

26-
AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
27+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2728

2829
AC_MSG_CHECKING([if we are on Linux with TCP])
2930
# If we have struct sockaddr and we're on Linux, then we're

‎src/mca/pif/posix_ipv4/configure.m4

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Copyright (c) 2015 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
66
# Copyright (c) 2016 Intel, Inc. All rights reserved.
7+
# Copyright (c) 2023 Nanook Consulting. All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -26,7 +27,7 @@ AC_DEFUN([MCA_pmix_pif_posix_ipv4_CONFIG], [
2627
PMIX_VAR_SCOPE_PUSH([pmix_pif_posix_ipv4_happy])
2728
pmix_pif_posix_ipv4_happy=no
2829

29-
AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
30+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
3031

3132
# If we found struct sockaddr and we're NOT on most of the BSDs,
3233
# we're happy. I.e., if posix but not:
@@ -35,8 +36,8 @@ AC_DEFUN([MCA_pmix_pif_posix_ipv4_CONFIG], [
3536
AC_MSG_CHECKING([struct sockaddr])
3637
AS_IF([test "$pmix_found_sockaddr" = "yes"],
3738
[AC_MSG_RESULT([yes (cached)])
38-
AC_MSG_CHECKING([not NetBSD, FreeBSD, OpenBSD, or DragonFly])
39-
AS_IF([test "$pmix_found_netbsd" = "no" && test "$pmix_found_freebsd" = "no" && test "$pmix_found_openbsd" = "no" && test "$pmix_found_dragonfly" = "no"],
39+
AC_MSG_CHECKING([not NetBSD, FreeBSD, OpenBSD, Apple, or DragonFly])
40+
AS_IF([test "$oac_found_netbsd" = "no" && test "$oac_found_freebsd" = "no" && test "$oac_found_openbsd" = "no" && test "$oac_found_dragonfly" = "no" && test "$oac_found_apple" = "no"],
4041
[AC_MSG_RESULT([yes])
4142
pmix_pif_posix_ipv4_happy=yes],
4243
[AC_MSG_RESULT([no])]

‎src/mca/pif/solaris_ipv6/configure.m4

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2016 Intel, Inc. All rights reserved.
5+
# Copyright (c) 2023 Nanook Consulting. All rights reserved.
56
# $COPYRIGHT$
67
#
78
# Additional copyrights may follow
@@ -21,10 +22,10 @@ AC_DEFUN([MCA_pmix_pif_solaris_ipv6_COMPILE_MODE], [
2122
AC_DEFUN([MCA_pmix_pif_solaris_ipv6_CONFIG], [
2223
AC_CONFIG_FILES([src/mca/pif/solaris_ipv6/Makefile])
2324

24-
AC_REQUIRE([PMIX_CHECK_OS_FLAVORS])
25+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2526

2627
# check to see if we are on a solaris machine
27-
AS_IF([test "$pmix_found_sun" = "yes"], [$1], [$2])
28+
AS_IF([test "$oac_found_sun" = "yes"], [$1], [$2])
2829
])dnl
2930

3031
#

‎src/mca/ptl/base/ptl_base_connect.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2015-2020 Intel, Inc. All rights reserved.
13-
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
13+
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
1414
* $COPYRIGHT$
1515
*
1616
* Additional copyrights may follow
@@ -42,7 +42,7 @@
4242
#ifdef HAVE_DIRENT_H
4343
# include <dirent.h>
4444
#endif
45-
#if PMIX_HAVE_APPLE && defined(HAVE_SYS_SYSCTL_H)
45+
#if OAC_HAVE_APPLE && defined(HAVE_SYS_SYSCTL_H)
4646
# include <sys/sysctl.h>
4747
#endif
4848

@@ -251,7 +251,7 @@ char *pmix_ptl_base_get_cmd_line(void)
251251
{
252252
char *p = NULL;
253253

254-
#if PMIX_HAVE_APPLE
254+
#if OAC_HAVE_APPLE
255255
int mib[3], argmax, nargs, num;
256256
size_t size;
257257
char *procargs = NULL, *cp, *cptr;

‎test/test_v2/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# and Technology (RIST). All rights reserved.
1717
# Copyright (c) 2021 Triad National Security, LLC
1818
# All rights reserved.
19-
# Copyright (c) 2021 Nanook Consulting. All rights reserved.
19+
# Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
2020
# $COPYRIGHT$
2121
#
2222
# Additional copyrights may follow
@@ -61,7 +61,7 @@ TC7FILES = test_fence_partial.c $(TCCOMMONFILES)
6161
# Note the use of -no-install in LDFLAGS to force rpath
6262
# into binaries and prevent libtool from creating the usual scripts.
6363
# This simplifies testing and debugging.
64-
if PMIX_HAVE_APPLE
64+
if OAC_HAVE_APPLE
6565
INSTALLFLAG=-no-fast-install
6666
else
6767
INSTALLFLAG=-no-install

0 commit comments

Comments
 (0)