Skip to content

Commit bb9ca43

Browse files
bosilcabosilca
authored
Merge pull request #13206 from rhc54/topic/solaris
Remove stale solaris configure references
2 parents 2c9dd0a + f744b78 commit bb9ca43

File tree

13 files changed

+69
-170
lines changed

13 files changed

+69
-170
lines changed

‎autogen.pl

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
1212
# All Rights reserved.
1313
#
14+
# Copyright (c) 2025 Nanook Consulting All rights reserved.
1415
# $COPYRIGHT$
1516
#
1617
# Additional copyrights may follow
@@ -81,12 +82,6 @@
8182

8283
# Patch program
8384
my $patch_prog = "patch";
84-
# Solaris "patch" doesn't understand unified diffs, and will cause
85-
# autogen.pl to hang with a "File to patch:" prompt. Default to Linux
86-
# "patch", but use "gpatch" on Solaris.
87-
if ($^O eq "solaris") {
88-
$patch_prog = "gpatch";
89-
}
9085

9186
$username = $ENV{USER} || getpwuid($>);
9287
$full_hostname = $ENV{HOSTNAME} || `hostname`;

‎config/ompi_setup_java.m4

+1-16
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dnl Copyright (c) 2013 Intel, Inc. All rights reserved.
1818
dnl Copyright (c) 2015-2018 Research Organization for Information Science
1919
dnl and Technology (RIST). All rights reserved.
2020
dnl Copyright (c) 2017 FUJITSU LIMITED. All rights reserved.
21+
dnl Copyright (c) 2025 Nanook Consulting All rights reserved.
2122
dnl $COPYRIGHT$
2223
dnl
2324
dnl Additional copyrights may follow
@@ -128,17 +129,6 @@ AC_DEFUN([_OMPI_SETUP_JAVA],[
128129
[AC_MSG_RESULT([not found])])])
129130
fi
130131

131-
if test "$ompi_java_found" = "0"; then
132-
# Solaris
133-
ompi_java_dir=/usr/java
134-
AC_MSG_CHECKING([for Java in Solaris locations])
135-
AS_IF([test -d $ompi_java_dir && test -r "$ompi_java_dir/include/jni.h"],
136-
[AC_MSG_RESULT([found ($ompi_java_dir)])
137-
with_jdk_headers=$ompi_java_dir/include
138-
with_jdk_bindir=$ompi_java_dir/bin
139-
ompi_java_found=1],
140-
[AC_MSG_RESULT([not found])])
141-
fi
142132
],
143133
[ompi_java_found=1])
144134

@@ -188,11 +178,6 @@ EOF
188178
# too. Ugh.
189179
AS_IF([test -d "$with_jdk_headers/linux"],
190180
[OMPI_JDK_CPPFLAGS="$OMPI_JDK_CPPFLAGS -I$with_jdk_headers/linux"])
191-
# Solaris JDK also require -I<blah>/solaris.
192-
# See if that's there, and if so, add a -I for that,
193-
# too. Ugh.
194-
AS_IF([test -d "$with_jdk_headers/solaris"],
195-
[OMPI_JDK_CPPFLAGS="$OMPI_JDK_CPPFLAGS -I$with_jdk_headers/solaris"])
196181
# Darwin JDK also require -I<blah>/darwin.
197182
# See if that's there, and if so, add a -I for that,
198183
# too. Ugh.

‎config/opal_check_os_flavors.m4

-69
This file was deleted.

‎configure.ac

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
# Copyright (c) 2019 Triad National Security, LLC. All rights
3030
# reserved.
3131
# Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved.
32+
# Copyright (c) 2025 Nanook Consulting All rights reserved.
3233
# $COPYRIGHT$
3334
#
3435
# Additional copyrights may follow
@@ -995,7 +996,7 @@ AC_CACHE_SAVE
995996
opal_show_title "System-specific tests"
996997

997998
##################################
998-
OPAL_CHECK_OS_FLAVORS
999+
OAC_CHECK_OS_FLAVORS
9991000

10001001

10011002

‎opal/mca/if/bsdx_ipv4/configure.m4

+14-11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2015 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
6+
# Copyright (c) 2025 Nanook Consulting All rights reserved.
7+
# Copyright (c) 2025 Jeffrey M. Squyres. All rights reserved.
68
# $COPYRIGHT$
79
#
810
# Additional copyrights may follow
@@ -22,25 +24,26 @@ AC_DEFUN([MCA_opal_if_bsdx_ipv4_COMPILE_MODE], [
2224
AC_DEFUN([MCA_opal_if_bsdx_ipv4_CONFIG], [
2325
AC_CONFIG_FILES([opal/mca/if/bsdx_ipv4/Makefile])
2426

25-
AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
27+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2628

27-
# If we found struct sockaddr and we're on any of the BSDs, we're
29+
# If we previously found struct sockaddr_in (we don't repeat the
30+
# AC CHECK_TYPES test here simply because it's cumbersome with all
31+
# the required #includes) and we're on any of the BSDs, we're
2832
# happy. I.e., this:
2933
#if defined(__NetBSD__) || defined(__FreeBSD__) || \
3034
# defined(__OpenBSD__) || defined(__DragonFly__)
31-
AC_MSG_CHECKING([struct sockaddr])
32-
AS_IF([test "$opal_found_sockaddr" = "yes"],
33-
[AC_MSG_RESULT([yes (cached)])
35+
AC_MSG_CHECKING([struct sockaddr_in again])
36+
AS_IF([test "$ac_cv_type_struct_sockaddr_in" = "yes"],
37+
[AC_MSG_RESULT([yes (OPAL cached)])
3438
AC_MSG_CHECKING([NetBSD, FreeBSD, OpenBSD, or DragonFly])
35-
AS_IF([test "$opal_found_netbsd" = "yes" || \
36-
test "$opal_found_freebsd" = "yes" || \
37-
test "$opal_found_openbsd" = "yes" || \
38-
test "$opal_found_dragonfly" = "yes"],
39+
AS_IF([test "$oac_found_netbsd" = "yes" || \
40+
test "$oac_found_freebsd" = "yes" || \
41+
test "$oac_found_openbsd" = "yes" || \
42+
test "$oac_found_dragonfly" = "yes"],
3943
[AC_MSG_RESULT([yes])
4044
$1],
4145
[AC_MSG_RESULT([no])
4246
$2])],
43-
[AC_MSG_RESULT([no (cached)])
47+
[AC_MSG_RESULT([no (OPAL cached)])
4448
$2])
4549
])
46-

‎opal/mca/if/bsdx_ipv6/configure.m4

+16-12
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2015 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
6+
# Copyright (c) 2025 Nanook Consulting All rights reserved.
7+
# Copyright (c) 2025 Jeffrey M. Squyres. All rights reserved.
68
# $COPYRIGHT$
79
#
810
# Additional copyrights may follow
@@ -22,26 +24,28 @@ AC_DEFUN([MCA_opal_if_bsdx_ipv6_COMPILE_MODE], [
2224
AC_DEFUN([MCA_opal_if_bsdx_ipv6_CONFIG], [
2325
AC_CONFIG_FILES([opal/mca/if/bsdx_ipv6/Makefile])
2426

25-
AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
27+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2628

27-
# If we found struct sockaddr and we're on any of the BSDs, we're
29+
# If we previously found struct sockaddr_in6 (we don't repeat the
30+
# AC CHECK_TYPES test here simply because it's cumbersome with all
31+
# the required #includes) and we're on any of the BSDs, we're
2832
# happy. I.e., this:
2933
#if defined( __NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
3034
# defined(__386BSD__) || defined(__bsdi__) || defined(__APPLE__)
31-
AC_MSG_CHECKING([struct sockaddr])
32-
AS_IF([test "$opal_found_sockaddr" = "yes"],
33-
[AC_MSG_RESULT([yes (cached)])
35+
AC_MSG_CHECKING([struct sockaddr_in6 again])
36+
AS_IF([test "$ac_cv_type_struct_sockaddr_in6" = "yes"],
37+
[AC_MSG_RESULT([yes (OPAL cached)])
3438
AC_MSG_CHECKING([some flavor of BSD])
35-
AS_IF([test "$opal_found_netbsd" = "yes" || \
36-
test "$opal_found_freebsd" = "yes" || \
37-
test "$opal_found_openbsd" = "yes" || \
38-
test "$opal_found_386bsd" = "yes" || \
39-
test "$opal_found_bsdi" = "yes" ||
40-
test "$opal_found_apple" = "yes"],
39+
AS_IF([test "$oac_found_netbsd" = "yes" || \
40+
test "$oac_found_freebsd" = "yes" || \
41+
test "$oac_found_openbsd" = "yes" || \
42+
test "$oac_found_386bsd" = "yes" || \
43+
test "$oac_found_bsdi" = "yes" ||
44+
test "$oac_found_apple" = "yes"],
4145
[AC_MSG_RESULT([yes])
4246
$1],
4347
[AC_MSG_RESULT([no])
4448
$2])],
45-
[AC_MSG_RESULT([no (cached)])
49+
[AC_MSG_RESULT([no (OPAL cached)])
4650
$2])
4751
])dnl

‎opal/mca/if/linux_ipv6/configure.m4

+8-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2015 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
6+
# Copyright (c) 2025 Nanook Consulting All rights reserved.
7+
# Copyright (c) 2025 Jeffrey M. Squyres. All rights reserved.
68
# $COPYRIGHT$
79
#
810
# Additional copyrights may follow
@@ -22,12 +24,13 @@ AC_DEFUN([MCA_opal_if_linux_ipv6_COMPILE_MODE], [
2224
AC_DEFUN([MCA_opal_if_linux_ipv6_CONFIG], [
2325
AC_CONFIG_FILES([opal/mca/if/linux_ipv6/Makefile])
2426

25-
AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
27+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2628

27-
AC_MSG_CHECKING([if we are on Linux with TCP])
28-
# If we have struct sockaddr and we're on Linux, then we're
29-
# happy.
30-
AS_IF([test "$opal_found_sockaddr" = "yes" && test "$opal_found_linux" = "yes"],
29+
# If we previously found struct sockaddr_in6 (we don't repeat the
30+
# AC CHECK_TYPES test here simply because it's cumbersome with all
31+
# the required #includes) and we're on Linux, we're happy.
32+
AC_MSG_CHECKING([for Linux with struct sockaddr_in6])
33+
AS_IF([test "$ac_cv_type_struct_sockaddr_in6" = "yes" && test "$oac_found_linux" = "yes"],
3134
[AC_MSG_RESULT([yes])
3235
$1],
3336
[AC_MSG_RESULT([no])

‎opal/mca/if/posix_ipv4/configure.m4

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2015 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
6+
# Copyright (c) 2025 Nanook Consulting All rights reserved.
7+
# Copyright (c) 2025 Jeffrey M. Squyres. All rights reserved.
68
# $COPYRIGHT$
79
#
810
# Additional copyrights may follow
@@ -25,22 +27,24 @@ AC_DEFUN([MCA_opal_if_posix_ipv4_CONFIG], [
2527
OPAL_VAR_SCOPE_PUSH([opal_if_posix_ipv4_happy])
2628
opal_if_posix_ipv4_happy=no
2729

28-
AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
30+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2931

30-
# If we found struct sockaddr and we're NOT on most of the BSDs,
31-
# we're happy. I.e., if posix but not:
32+
# If we previously found struct sockaddr_in (we don't repeat the
33+
# AC CHECK_TYPES test here simply because it's cumbersome with all
34+
# the required #includes) and we're NOT on most of the BSDs, we're
35+
# happy. I.e., this:
3236
#if defined(__NetBSD__) || defined(__FreeBSD__) || \
3337
# defined(__OpenBSD__) || defined(__DragonFly__)
34-
AC_MSG_CHECKING([struct sockaddr])
35-
AS_IF([test "$opal_found_sockaddr" = "yes"],
36-
[AC_MSG_RESULT([yes (cached)])
38+
AC_MSG_CHECKING([struct sockaddr_in again])
39+
AS_IF([test "$ac_cv_type_struct_sockaddr_in" = "yes"],
40+
[AC_MSG_RESULT([yes (OPAL cached)])
3741
AC_MSG_CHECKING([not NetBSD, FreeBSD, OpenBSD, or DragonFly])
38-
AS_IF([test "$opal_found_netbsd" = "no" && test "$opal_found_freebsd" = "no" && test "$opal_found_openbsd" = "no" && test "$opal_found_dragonfly" = "no"],
42+
AS_IF([test "$oac_found_netbsd" = "no" && test "$oac_found_freebsd" = "no" && test "$oac_found_openbsd" = "no" && test "$oac_found_dragonfly" = "no"],
3943
[AC_MSG_RESULT([yes])
4044
opal_if_posix_ipv4_happy=yes],
4145
[AC_MSG_RESULT([no])]
4246
)],
43-
[AC_MSG_RESULT([no (cached)])]
47+
[AC_MSG_RESULT([no (OPAL cached)])]
4448
)
4549

4650
AS_IF([test "$opal_if_posix_ipv4_happy" = "yes"],

‎opal/mca/shmem/posix/shmem_posix_common_utils.c

+3-8
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* reserved.
2020
* Copyright (c) 2022 IBM Corporation. All rights reserved
2121
*
22+
* Copyright (c) 2025 Nanook Consulting All rights reserved.
2223
* $COPYRIGHT$
2324
*
2425
* Additional copyrights may follow
@@ -33,15 +34,9 @@
3334
# include <fcntl.h>
3435
#endif /* HAVE_FCNTL_H */
3536
#include <string.h>
36-
#if OPAL_HAVE_SOLARIS && !defined(_POSIX_C_SOURCE)
37-
# define _POSIX_C_SOURCE 200112L /* Required for shm_{open,unlink} decls */
37+
#ifdef HAVE_SYS_MMAN_H
3838
# include <sys/mman.h>
39-
# undef _POSIX_C_SOURCE
40-
#else
41-
# ifdef HAVE_SYS_MMAN_H
42-
# include <sys/mman.h>
43-
# endif /* HAVE_SYS_MMAN_H */
44-
#endif
39+
#endif /* HAVE_SYS_MMAN_H */
4540
#ifdef HAVE_UNISTD_H
4641
# include <unistd.h>
4742
#endif /* HAVE_UNISTD_H */

‎opal/mca/shmem/posix/shmem_posix_module.c

+3-8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* Copyright (c) 2019 Triad National Security, LLC. All rights
1818
* reserved.
1919
* Copyright (c) 2022 IBM Corporation. All rights reserved
20+
* Copyright (c) 2025 Nanook Consulting All rights reserved.
2021
* $COPYRIGHT$
2122
*
2223
* Additional copyrights may follow
@@ -30,15 +31,9 @@
3031
#ifdef HAVE_FCNTL_H
3132
# include <fcntl.h>
3233
#endif /* HAVE_FCNTL_H */
33-
#if OPAL_HAVE_SOLARIS && !defined(_POSIX_C_SOURCE)
34-
# define _POSIX_C_SOURCE 200112L /* Required for shm_{open,unlink} decls */
34+
#ifdef HAVE_SYS_MMAN_H
3535
# include <sys/mman.h>
36-
# undef _POSIX_C_SOURCE
37-
#else
38-
# ifdef HAVE_SYS_MMAN_H
39-
# include <sys/mman.h>
40-
# endif /* HAVE_SYS_MMAN_H */
41-
#endif
36+
#endif /* HAVE_SYS_MMAN_H */
4237
#ifdef HAVE_UNISTD_H
4338
# include <unistd.h>
4439
#endif /* HAVE_UNISTD_H */

0 commit comments

Comments
 (0)