Skip to content

Commit 6dae8ab

Browse files
rhc54rhc54
committed
Remove stale solaris configure references
A prior commit (PR #13163) removed the stale Solaris components as we no longer support that environment. However, the PR left the Solaris configure references in the code base. This PR removes those references. It also removes a duplicate m4 file (opal_check_os_flavors.m4) that exists in the OAC configure area. All references to the OPAL version have been updated to OAC. Signed-off-by: Ralph Castain <rhc@pmix.org>
1 parent f6fe1d4 commit 6dae8ab

File tree

13 files changed

+27
-138
lines changed

13 files changed

+27
-138
lines changed

‎autogen.pl

Lines changed: 1 addition & 6 deletions
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

Lines changed: 1 addition & 16 deletions
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

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

‎configure.ac

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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.
67
# $COPYRIGHT$
78
#
89
# Additional copyrights may follow
@@ -22,7 +23,7 @@ AC_DEFUN([MCA_opal_if_bsdx_ipv4_COMPILE_MODE], [
2223
AC_DEFUN([MCA_opal_if_bsdx_ipv4_CONFIG], [
2324
AC_CONFIG_FILES([opal/mca/if/bsdx_ipv4/Makefile])
2425

25-
AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
26+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2627

2728
# If we found struct sockaddr and we're on any of the BSDs, we're
2829
# happy. I.e., this:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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.
67
# $COPYRIGHT$
78
#
89
# Additional copyrights may follow
@@ -22,7 +23,7 @@ AC_DEFUN([MCA_opal_if_bsdx_ipv6_COMPILE_MODE], [
2223
AC_DEFUN([MCA_opal_if_bsdx_ipv6_CONFIG], [
2324
AC_CONFIG_FILES([opal/mca/if/bsdx_ipv6/Makefile])
2425

25-
AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
26+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2627

2728
# If we found struct sockaddr and we're on any of the BSDs, we're
2829
# happy. I.e., this:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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.
67
# $COPYRIGHT$
78
#
89
# Additional copyrights may follow
@@ -22,7 +23,7 @@ AC_DEFUN([MCA_opal_if_linux_ipv6_COMPILE_MODE], [
2223
AC_DEFUN([MCA_opal_if_linux_ipv6_CONFIG], [
2324
AC_CONFIG_FILES([opal/mca/if/linux_ipv6/Makefile])
2425

25-
AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
26+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2627

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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.
67
# $COPYRIGHT$
78
#
89
# Additional copyrights may follow
@@ -25,7 +26,7 @@ AC_DEFUN([MCA_opal_if_posix_ipv4_CONFIG], [
2526
OPAL_VAR_SCOPE_PUSH([opal_if_posix_ipv4_happy])
2627
opal_if_posix_ipv4_happy=no
2728

28-
AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
29+
AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
2930

3031
# If we found struct sockaddr and we're NOT on most of the BSDs,
3132
# we're happy. I.e., if posix but not:

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

Lines changed: 3 additions & 8 deletions
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

Lines changed: 3 additions & 8 deletions
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)