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>

Author: rhc54

autogen.pl

@@ -11,6 +11,7 @@
 # Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
 # All Rights reserved.
 #
+# Copyright (c) 2025 Nanook Consulting All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -81,12 +82,6 @@
 
 # Patch program
 my $patch_prog = "patch";
-# Solaris "patch" doesn't understand unified diffs, and will cause
-# autogen.pl to hang with a "File to patch:" prompt. Default to Linux
-# "patch", but use "gpatch" on Solaris.
-if ($^O eq "solaris") {
- $patch_prog = "gpatch";
-}
 
 $username = $ENV{USER} || getpwuid($>);
 $full_hostname = $ENV{HOSTNAME} || `hostname`;

config/ompi_setup_java.m4

@@ -18,6 +18,7 @@ dnl Copyright (c) 2013 Intel, Inc. All rights reserved.
 dnl Copyright (c) 2015-2018 Research Organization for Information Science
 dnl and Technology (RIST). All rights reserved.
 dnl Copyright (c) 2017 FUJITSU LIMITED. All rights reserved.
+dnl Copyright (c) 2025 Nanook Consulting All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -128,17 +129,6 @@ AC_DEFUN([_OMPI_SETUP_JAVA],[
  [AC_MSG_RESULT([not found])])])
  fi
 
- if test "$ompi_java_found" = "0"; then
- # Solaris
- ompi_java_dir=/usr/java
- AC_MSG_CHECKING([for Java in Solaris locations])
- AS_IF([test -d $ompi_java_dir && test -r "$ompi_java_dir/include/jni.h"],
- [AC_MSG_RESULT([found ($ompi_java_dir)])
- with_jdk_headers=$ompi_java_dir/include
- with_jdk_bindir=$ompi_java_dir/bin
- ompi_java_found=1],
- [AC_MSG_RESULT([not found])])
- fi
  ],
  [ompi_java_found=1])
 
@@ -188,11 +178,6 @@ EOF
  # too. Ugh.
  AS_IF([test -d "$with_jdk_headers/linux"],
  [OMPI_JDK_CPPFLAGS="$OMPI_JDK_CPPFLAGS -I$with_jdk_headers/linux"])
- # Solaris JDK also require -I<blah>/solaris.
- # See if that's there, and if so, add a -I for that,
- # too. Ugh.
- AS_IF([test -d "$with_jdk_headers/solaris"],
- [OMPI_JDK_CPPFLAGS="$OMPI_JDK_CPPFLAGS -I$with_jdk_headers/solaris"])
  # Darwin JDK also require -I<blah>/darwin.
  # See if that's there, and if so, add a -I for that,
  # too. Ugh.

config/opal_check_os_flavors.m4

@@ -29,6 +29,7 @@
 # Copyright (c) 2019 Triad National Security, LLC. All rights
 # reserved.
 # Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved.
+# Copyright (c) 2025 Nanook Consulting All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -995,7 +996,7 @@ AC_CACHE_SAVE
 opal_show_title "System-specific tests"
 
 ##################################
-OPAL_CHECK_OS_FLAVORS
+OAC_CHECK_OS_FLAVORS
 
 
 

configure.ac

@@ -3,6 +3,7 @@
 # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
 # Copyright (c) 2015 Research Organization for Information Science
 # and Technology (RIST). All rights reserved.
+# Copyright (c) 2025 Nanook Consulting All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -22,7 +23,7 @@ AC_DEFUN([MCA_opal_if_bsdx_ipv4_COMPILE_MODE], [
 AC_DEFUN([MCA_opal_if_bsdx_ipv4_CONFIG], [
  AC_CONFIG_FILES([opal/mca/if/bsdx_ipv4/Makefile])
 
- AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
+ AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
 
  # If we found struct sockaddr and we're on any of the BSDs, we're
  # happy. I.e., this:

opal/mca/if/bsdx_ipv4/configure.m4

@@ -3,6 +3,7 @@
 # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
 # Copyright (c) 2015 Research Organization for Information Science
 # and Technology (RIST). All rights reserved.
+# Copyright (c) 2025 Nanook Consulting All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -22,7 +23,7 @@ AC_DEFUN([MCA_opal_if_bsdx_ipv6_COMPILE_MODE], [
 AC_DEFUN([MCA_opal_if_bsdx_ipv6_CONFIG], [
  AC_CONFIG_FILES([opal/mca/if/bsdx_ipv6/Makefile])
 
- AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
+ AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
 
  # If we found struct sockaddr and we're on any of the BSDs, we're
  # happy. I.e., this:

opal/mca/if/bsdx_ipv6/configure.m4

@@ -3,6 +3,7 @@
 # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
 # Copyright (c) 2015 Research Organization for Information Science
 # and Technology (RIST). All rights reserved.
+# Copyright (c) 2025 Nanook Consulting All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -22,7 +23,7 @@ AC_DEFUN([MCA_opal_if_linux_ipv6_COMPILE_MODE], [
 AC_DEFUN([MCA_opal_if_linux_ipv6_CONFIG], [
  AC_CONFIG_FILES([opal/mca/if/linux_ipv6/Makefile])
 
- AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
+ AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
 
  AC_MSG_CHECKING([if we are on Linux with TCP])
  # If we have struct sockaddr and we're on Linux, then we're

opal/mca/if/linux_ipv6/configure.m4

@@ -3,6 +3,7 @@
 # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
 # Copyright (c) 2015 Research Organization for Information Science
 # and Technology (RIST). All rights reserved.
+# Copyright (c) 2025 Nanook Consulting All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -25,7 +26,7 @@ AC_DEFUN([MCA_opal_if_posix_ipv4_CONFIG], [
  OPAL_VAR_SCOPE_PUSH([opal_if_posix_ipv4_happy])
  opal_if_posix_ipv4_happy=no
 
- AC_REQUIRE([OPAL_CHECK_OS_FLAVORS])
+ AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
 
  # If we found struct sockaddr and we're NOT on most of the BSDs,
  # we're happy. I.e., if posix but not:

opal/mca/if/posix_ipv4/configure.m4

@@ -19,6 +19,7 @@
  * reserved.
  * Copyright (c) 2022 IBM Corporation. All rights reserved
  *
+ * Copyright (c) 2025 Nanook Consulting All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -33,15 +34,9 @@
 # include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
 #include <string.h>
-#if OPAL_HAVE_SOLARIS && !defined(_POSIX_C_SOURCE)
-# define _POSIX_C_SOURCE 200112L /* Required for shm_{open,unlink} decls */
+#ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
-# undef _POSIX_C_SOURCE
-#else
-# ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-# endif /* HAVE_SYS_MMAN_H */
-#endif
+#endif /* HAVE_SYS_MMAN_H */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */

opal/mca/shmem/posix/shmem_posix_common_utils.c

@@ -17,6 +17,7 @@
  * Copyright (c) 2019 Triad National Security, LLC. All rights
  * reserved.
  * Copyright (c) 2022 IBM Corporation. All rights reserved
+ * Copyright (c) 2025 Nanook Consulting All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -30,15 +31,9 @@
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
-#if OPAL_HAVE_SOLARIS && !defined(_POSIX_C_SOURCE)
-# define _POSIX_C_SOURCE 200112L /* Required for shm_{open,unlink} decls */
+#ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
-# undef _POSIX_C_SOURCE
-#else
-# ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-# endif /* HAVE_SYS_MMAN_H */
-#endif
+#endif /* HAVE_SYS_MMAN_H */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */