Skip to content

Commit 4137842

Browse files
committed
gh-157949: Remove dead UnixWare, OpenServer and ReliantUNIX support code
1 parent 9777e8a commit 4137842

7 files changed

Lines changed: 6 additions & 140 deletions

File tree

‎Lib/test/test_fcntl.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def get_lockdata():
7373
fcntl.F_WRLCK, 0)
7474
elif sys.platform.startswith('gnukfreebsd'):
7575
lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0)
76-
elif sys.platform in ['hp-uxB', 'unixware7']:
76+
elif sys.platform == 'hp-uxB':
7777
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
7878
else:
7979
lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Remove dead build and preprocessor code for SCO UnixWare, OpenUNIX, SCO
2+
OpenServer and ReliantUNIX.

‎Modules/_cursesmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static const char PyCursesVersion[] = "2.2";
120120
#include <langinfo.h>
121121
#endif
122122

123-
#if !defined(NCURSES_VERSION) && (defined(sgi) || defined(__sun) || defined(SCO5))
123+
#if !defined(NCURSES_VERSION) && (defined(sgi) || defined(__sun))
124124
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
125125
typedef chtype attr_t; /* No attr_t type is available */
126126
#endif

‎Modules/posixmodule.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14111,11 +14111,6 @@ os_WSTOPSIG_impl(PyObject *module, int status)
1411114111

1411214112

1411314113
#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
14114-
#ifdef _SCO_DS
14115-
/* SCO OpenServer 5.0 and later requires _SVID3 before it reveals the
14116-
needed definitions in sys/statvfs.h */
14117-
#define _SVID3
14118-
#endif
1411914114
#include <sys/statvfs.h>
1412014115

1412114116
#ifdef __APPLE__

‎configure‎

Lines changed: 1 addition & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,6 @@ AH_TOP([
238238
#define Py_PYCONFIG_H
239239
])
240240
AH_BOTTOM([
241-
/* Define the macros needed if on a UnixWare 7.x system. */
242-
#if defined(__USLC__) && defined(__SCO_VERSION__)
243-
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
244-
#endif
245-
246241
#endif /*Py_PYCONFIG_H*/
247242
])
248243

@@ -368,8 +363,7 @@ then
368363
ac_sys_release=
369364
else
370365
ac_sys_system=`uname -s`
371-
if test "$ac_sys_system" = "AIX" \
372-
-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
366+
if test "$ac_sys_system" = "AIX"; then
373367
ac_sys_release=`uname -v`
374368
else
375369
ac_sys_release=`uname -r`
@@ -873,15 +867,6 @@ case $ac_sys_system/$ac_sys_release in
873867
# A lower level is defined below.
874868
SunOS/*)
875869
define_xopen_source=no;;
876-
# On UnixWare 7, u_long is never defined with _XOPEN_SOURCE,
877-
# but used in /usr/include/netinet/tcp.h. Reported by Tim Rice.
878-
# Reconfirmed for 7.1.4 by Martin v. Loewis.
879-
OpenUNIX/8.0.0| UnixWare/7.1.@<:@0-4@:>@)
880-
define_xopen_source=no;;
881-
# On OpenServer 5, u_short is never defined with _XOPEN_SOURCE,
882-
# but used in struct sockaddr.sa_family. Reported by Tim Rice.
883-
SCO_SV/3.2)
884-
define_xopen_source=no;;
885870
# On MacOS X 10.2, a bug in ncurses.h means that it craps out if
886871
# _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
887872
# identifies itself as Darwin/7.*
@@ -2417,11 +2402,6 @@ then
24172402
OPT="-O3 -Wall"
24182403
;;
24192404
esac
2420-
2421-
case $ac_sys_system in
2422-
SCO_SV*) OPT="$OPT -m486 -DSCO5"
2423-
;;
2424-
esac
24252405
;;
24262406

24272407
*)
@@ -2789,10 +2769,6 @@ AS_VAR_IF([ac_cv_gcc_compat], [yes], [
27892769
esac
27902770
27912771
case $ac_sys_system in
2792-
SCO_SV*)
2793-
BASECFLAGS="$BASECFLAGS -m486 -DSCO5"
2794-
;;
2795-
27962772
Darwin*)
27972773
# -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
27982774
# used to be here, but non-Apple gcc doesn't accept them.
@@ -2946,15 +2922,6 @@ AS_VAR_IF([ac_cv_gcc_compat], [yes], [
29462922
# end of Darwin* tests
29472923
;;
29482924
esac
2949-
], [
2950-
case $ac_sys_system in
2951-
OpenUNIX*|UnixWare*)
2952-
BASECFLAGS="$BASECFLAGS -K pentium,host,inline,loop_unroll,alloca "
2953-
;;
2954-
SCO_SV*)
2955-
BASECFLAGS="$BASECFLAGS -belf -Ki486 -DSCO5"
2956-
;;
2957-
esac
29582925
])
29592926

29602927
# Check for --enable-experimental-jit:
@@ -3336,13 +3303,6 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64],
33363303
[This must be set to 64 on some systems to enable large file support.])
33373304
fi
33383305

3339-
# Add some code to confdefs.h so that the test for off_t works on SCO
3340-
cat >> confdefs.h <<\EOF
3341-
#if defined(SCO_DS)
3342-
#undef _OFF_T
3343-
#endif
3344-
EOF
3345-
33463306
# Type availability checks
33473307
AC_TYPE_MODE_T
33483308
AC_TYPE_OFF_T
@@ -3723,17 +3683,6 @@ then
37233683
NetBSD*|DragonFly*)
37243684
LDSHARED='$(CC) -shared'
37253685
LDCXXSHARED='$(CXX) -shared';;
3726-
OpenUNIX*|UnixWare*)
3727-
if test "$ac_cv_gcc_compat" = "yes" ; then
3728-
LDSHARED='$(CC) -shared'
3729-
LDCXXSHARED='$(CXX) -shared'
3730-
else
3731-
LDSHARED='$(CC) -G'
3732-
LDCXXSHARED='$(CXX) -G'
3733-
fi;;
3734-
SCO_SV*)
3735-
LDSHARED='$(CC) -Wl,-G,-Bexport'
3736-
LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
37373686
WASI*)
37383687
AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [
37393688
dnl not implemented yet
@@ -3781,16 +3730,6 @@ then
37813730
]);;
37823731
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
37833732
Haiku*) CCSHARED="-fPIC";;
3784-
OpenUNIX*|UnixWare*)
3785-
if test "$ac_cv_gcc_compat" = "yes"
3786-
then CCSHARED="-fPIC"
3787-
else CCSHARED="-KPIC"
3788-
fi;;
3789-
SCO_SV*)
3790-
if test "$ac_cv_gcc_compat" = "yes"
3791-
then CCSHARED="-fPIC"
3792-
else CCSHARED="-Kpic -belf"
3793-
fi;;
37943733
VxWorks*)
37953734
CCSHARED="-fpic -D__SO_PICABILINUX__ -ftls-model=global-dynamic"
37963735
esac
@@ -3841,9 +3780,6 @@ then
38413780
fi
38423781
fi
38433782
;;
3844-
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
3845-
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
3846-
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
38473783
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
38483784
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
38493785
then

‎pyconfig.h.in‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,10 +2282,5 @@
22822282
#undef uid_t
22832283

22842284

2285-
/* Define the macros needed if on a UnixWare 7.x system. */
2286-
#if defined(__USLC__) && defined(__SCO_VERSION__)
2287-
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
2288-
#endif
2289-
22902285
#endif /*Py_PYCONFIG_H*/
22912286

0 commit comments

Comments
 (0)