Skip to content

Commit 260bbd5

Browse files
committed
Remove stale solaris components
We no longer support the solaris environment. PR filed for OAC to remove its checks as well. Refs: open-mpi/oac#20 Signed-off-by: Ralph Castain <[email protected]>
1 parent c4ed8c3 commit 260bbd5

File tree

7 files changed

+8
-280
lines changed

7 files changed

+8
-280
lines changed

autogen.pl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# and Technology (RIST). All rights reserved.
1010
# Copyright (c) 2015 IBM Corporation. All rights reserved.
1111
#
12-
# Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
12+
# Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
1313
# $COPYRIGHT$
1414
#
1515
# Additional copyrights may follow
@@ -75,12 +75,6 @@
7575

7676
# Patch program
7777
my $patch_prog = "patch";
78-
# Solaris "patch" doesn't understand unified diffs, and will cause
79-
# autogen.pl to hang with a "File to patch:" prompt. Default to Linux
80-
# "patch", but use "gpatch" on Solaris.
81-
if ($^O eq "solaris") {
82-
$patch_prog = "gpatch";
83-
}
8478

8579
$username = getpwuid($>);
8680
$full_hostname = `hostname`;

config/pmix_config_pthreads.m4

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ dnl Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
1313
dnl Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
1414
dnl Copyright (c) 2014-2016 Research Organization for Information Science
1515
dnl and Technology (RIST). All rights reserved.
16+
dnl Copyright (c) 2025 Nanook Consulting All rights reserved.
1617
dnl $COPYRIGHT$
1718
dnl
1819
dnl Additional copyrights may follow
@@ -154,22 +155,13 @@ AC_DEFUN([PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS],[
154155
# -Kthread:
155156
# -kthread: FreeBSD kernel threads
156157
# -pthread: Modern GCC (most all platforms)
157-
# -pthreads: GCC on solaris
158158
# -mthreads:
159-
# -mt: Solaris native compilers / HP-UX aCC
160159
#
161160
# Put -mt before -mthreads because HP-UX aCC will properly compile
162161
# with -mthreads (reading as -mt), but emit a warning about unknown
163-
# flags hreads. Stupid compilers.
164-
165-
case "${host_cpu}-${host_os}" in
166-
*solaris*)
167-
pflags="-pthread -pthreads -mt"
168-
;;
169-
*)
170-
pflags="-Kthread -kthread -pthread -pthreads -mt -mthreads"
171-
;;
172-
esac
162+
# flags threads. Stupid compilers.
163+
164+
pflags="-Kthread -kthread -pthread -pthreads -mt -mthreads"
173165
174166
AC_PROVIDE_IFELSE([AC_PROG_CC],
175167
[PMIX_INTL_POSIX_THREADS_SPECIAL_FLAGS_C],

src/include/pmix_config_bottom.h

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* All rights reserved.
1616
* Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
1717
* Copyright (c) 2016 IBM Corporation. All rights reserved.
18-
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
18+
* Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
1919
* $COPYRIGHT$
2020
*
2121
* Additional copyrights may follow
@@ -53,8 +53,8 @@
5353
*
5454
**********************************************************************/
5555

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

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

189189
#if PMIX_HAVE_ATTRIBUTE_FORMAT
190-
#if OAC_HAVE_SOLARIS
191-
# define __pmix_attribute_format__(a, b, c)
192-
#else
193190
# define __pmix_attribute_format__(a, b, c) __attribute__((__format__(a, b, c)))
194-
#endif
195191
#else
196192
# define __pmix_attribute_format__(a, b, c)
197193
#endif
@@ -300,11 +296,7 @@
300296
#endif
301297

302298
#if PMIX_HAVE_ATTRIBUTE_SENTINEL
303-
#if OAC_HAVE_SOLARIS
304-
# define __pmix_attribute_sentinel__
305-
#else
306299
# define __pmix_attribute_sentinel__ __attribute__((__sentinel__))
307-
#endif
308300
#else
309301
# define __pmix_attribute_sentinel__
310302
#endif

src/mca/pif/solaris_ipv6/Makefile.am

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

src/mca/pif/solaris_ipv6/configure.m4

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

src/mca/pif/solaris_ipv6/owner.txt

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

src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c

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

0 commit comments

Comments
 (0)