traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #615069: Fix build problems on SCO Open Server 5. Backported to 2.2.

This commit is contained in:
Martin v. Löwis 2002-09-30 16:19:48 +00:00
parent 174aa49a88
commit 21ee4091e1
5 changed files with 92 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Lib/test/regrtest.py
View File

@ -587,7 +587,7 @@ _expectations = {
test_winreg
test_winsound
""",
'unixware5':
'unixware7':
"""
test_al
test_bsddb
@ -611,6 +611,63 @@ _expectations = {
test_winreg
test_winsound
""",
'openunix8':
"""
test_al
test_bsddb
test_cd
test_cl
test_dl
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_minidom
test_nis
test_ntpath
test_openpty
test_pyexpat
test_sax
test_socketserver
test_sunaudiodev
test_sundry
test_unicode_file
test_winreg
test_winsound
""",
'sco_sv3':
"""
test_al
test_asynchat
test_bsddb
test_cd
test_cl
test_dl
test_fork1
test_gettext
test_gl
test_imgfile
test_largefile
test_linuxaudiodev
test_locale
test_minidom
test_nis
test_ntpath
test_openpty
test_pyexpat
test_queue
test_sax
test_socketserver
test_sunaudiodev
test_sundry
test_thread
test_threaded_import
test_threadedtempfile
test_threading
test_unicode_file
test_winreg
test_winsound
""",
'riscos':
"""
test_al

2
Modules/_cursesmodule.c
View File

@ -124,7 +124,7 @@ extern int setupterm(char *,int,int *);
#include <term.h>
#endif
#if !defined(HAVE_NCURSES_H) && (defined(sgi) || defined(__sun))
#if !defined(HAVE_NCURSES_H) && (defined(sgi) || defined(__sun) || defined(SCO5))
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
typedef chtype attr_t; /* No attr_t type is available */
#endif

2
Modules/_hotshot.c
View File

@ -64,6 +64,8 @@ typedef struct timeval hs_time;
#ifndef PATH_MAX
# ifdef MAX_PATH
# define PATH_MAX MAX_PATH
# elif defined (_POSIX_PATH_MAX)
# define PATH_MAX _POSIX_PATH_MAX
# else
# error "Need a defn. for PATH_MAX in _hotshot.c"
# endif

21
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 1.347 .
# From configure.in Revision: 1.348 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53.
#
@ -1295,7 +1295,8 @@ echo $ECHO_N "checking MACHDEP... $ECHO_C" >&6
if test -z "$MACHDEP"
then
ac_sys_system=`uname -s`
if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then
if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
ac_sys_release=`uname -v`
else
ac_sys_release=`uname -r`
@ -3459,11 +3460,17 @@ then
*)
OPT="-O3 -Wall -Wstrict-prototypes";;
esac
case $ac_sys_system in
SCO_SV*) OPT="$OPT -m486 -DSCO5";;
esac
;;
*)
case $ac_sys_system in
OpenUNIX*|UnixWare*)
OPT="-O -K pentium,host,inline,loop_unroll,alloca ";;
SCO_SV*)
CFLAGS="$CFLAGS -belf"
OPT="-belf -O -Ki486 -DSCO5";;
*)
OPT="-O";;
esac
@ -8891,7 +8898,7 @@ then
then LDSHARED="$(CC) -shared"
else LDSHARED="$(CC) -G"
fi;;
SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
SCO_SV*) LDSHARED="$(CC) -Wl,-G,-Bexport";;
Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
atheos*) LDSHARED="gcc -shared";;
@ -8923,7 +8930,11 @@ then
then CCSHARED="-fPIC"
else CCSHARED="-KPIC"
fi;;
SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
SCO_SV*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
else CCSHARED="-Kpic -belf"
fi;;
Monterey*) CCSHARED="-G";;
IRIX*/6*) case $CC in
*gcc*) CCSHARED="-shared";;
@ -8963,7 +8974,7 @@ then
fi
LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
FreeBSD*|NetBSD*|OpenBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]

19
configure.in
View File

@ -80,7 +80,8 @@ AC_MSG_CHECKING(MACHDEP)
if test -z "$MACHDEP"
then
ac_sys_system=`uname -s`
if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then
if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
ac_sys_release=`uname -v`
else
ac_sys_release=`uname -r`
@ -473,11 +474,17 @@ then
*)
OPT="-O3 -Wall -Wstrict-prototypes";;
esac
case $ac_sys_system in
SCO_SV*) OPT="$OPT -m486 -DSCO5";;
esac
;;
*)
case $ac_sys_system in
OpenUNIX*|UnixWare*)
OPT="-O -K pentium,host,inline,loop_unroll,alloca ";;
SCO_SV*)
CFLAGS="$CFLAGS -belf"
OPT="-belf -O -Ki486 -DSCO5";;
*)
OPT="-O";;
esac
@ -940,7 +947,7 @@ then
then LDSHARED="$(CC) -shared"
else LDSHARED="$(CC) -G"
fi;;
SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
SCO_SV*) LDSHARED="$(CC) -Wl,-G,-Bexport";;
Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
atheos*) LDSHARED="gcc -shared";;
@ -970,7 +977,11 @@ then
then CCSHARED="-fPIC"
else CCSHARED="-KPIC"
fi;;
SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
SCO_SV*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
else CCSHARED="-Kpic -belf"
fi;;
Monterey*) CCSHARED="-G";;
IRIX*/6*) case $CC in
*gcc*) CCSHARED="-shared";;
@ -1008,7 +1019,7 @@ then
fi
LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
FreeBSD*|NetBSD*|OpenBSD*)
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]