Skip to content

Commit b9949db

Browse files
author
Skip Montanaro
committed
Remove support for DYNIX, IRIX 4, --with-sgi-dl, --with-dl-dld
1 parent f8712e5 commit b9949db

File tree

6 files changed

+5
-185
lines changed

6 files changed

+5
-185
lines changed

‎PC/pyconfig.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -369,24 +369,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
369369
(which you can't on SCO ODT 3.0). */
370370
/* #undef SYS_SELECT_WITH_SYS_TIME */
371371

372-
/* Define if you want to use SGI (IRIX 4) dynamic linking.
373-
This requires the "dl" library by Jack Jansen,
374-
ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
375-
Don't bother on IRIX 5, it already has dynamic linking using SunOS
376-
style shared libraries */
377-
/* #undef WITH_SGI_DL */
378-
379-
/* Define if you want to emulate SGI (IRIX 4) dynamic linking.
380-
This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
381-
Sequent Symmetry (Dynix), and Atari ST.
382-
This requires the "dl-dld" library,
383-
ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z,
384-
as well as the "GNU dld" library,
385-
ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
386-
Don't bother on SunOS 4 or 5, they already have dynamic linking using
387-
shared libraries */
388-
/* #undef WITH_DL_DLD */
389-
390372
/* Define if you want documentation strings in extension modules */
391373
#define WITH_DOC_STRINGS 1
392374

‎Python/thread_sgi.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11

2-
#ifdef WITH_SGI_DL
3-
#define USE_DL
4-
#endif
5-
62
#include <stdlib.h>
73
#include <stdio.h>
84
#include <signal.h>

‎RISCOS/pyconfig.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -230,17 +230,6 @@
230230
one supplied by Python itself. (see Include/unicodectype.h). */
231231
#undef WANT_WCTYPE_FUNCTIONS
232232

233-
/* Define if you want to emulate SGI (IRIX 4) dynamic linking.
234-
This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
235-
Sequent Symmetry (Dynix), and Atari ST.
236-
This requires the "dl-dld" library,
237-
ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z,
238-
as well as the "GNU dld" library,
239-
ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
240-
Don't bother on SunOS 4 or 5, they already have dynamic linking using
241-
shared libraries */
242-
#undef WITH_DL_DLD
243-
244233
/* Define if you want to read files with foreign newlines. */
245234
#define WITH_UNIVERSAL_NEWLINES 1
246235

@@ -262,13 +251,6 @@
262251
/* Define if you want to use MacPython modules on MacOSX in unix-Python */
263252
#undef USE_TOOLBOX_OBJECT_GLUE
264253

265-
/* Define if you want to use SGI (IRIX 4) dynamic linking.
266-
This requires the "dl" library by Jack Jansen,
267-
ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
268-
Don't bother on IRIX 5, it already has dynamic linking using SunOS
269-
style shared libraries */
270-
#undef WITH_SGI_DL
271-
272254
/* Define if you want to compile in rudimentary thread support */
273255
#undef WITH_THREAD
274256

‎configure‎

Lines changed: 3 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 1.444 .
2+
# From configure.in Revision: 1.445 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.57 for python 2.4.
55
#
@@ -871,8 +871,6 @@ Optional Packages:
871871
--with(out)-doc-strings disable/enable documentation strings
872872
--with(out)-pymalloc disable/enable specialized mallocs
873873
--with-wctype-functions use wctype.h functions
874-
--with-sgi-dl=DIRECTORY IRIX 4 dynamic linking
875-
--with-dl-dld=DL_DIR GNU dynamic linking
876874
--with-fpectl enable SIGFPE catching
877875
--with-libm=STRING math library
878876
--with-libc=STRING C library
@@ -3010,7 +3008,7 @@ rm -f conftest*
30103008

30113009
# Check for unsupported systems
30123010
case $ac_sys_system/$ac_sys_release in
3013-
SunOS/4*|DYNIX/*|IRIX/4*|Linux*/1*)
3011+
SunOS/4*|Linux*/1*)
30143012
echo This system \($ac_sys_system/$ac_sys_release\) is no longer supported.
30153013
echo See README for details.
30163014
exit 1;;
@@ -9390,7 +9388,6 @@ then
93909388
fi ;;
93919389
hp*|HP*) LDSHARED="ld -b";;
93929390
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
9393-
DYNIX/ptx*) LDSHARED="ld -G";;
93949391
Darwin/1.3*)
93959392
LDSHARED='$(CC) $(LDFLAGS) -bundle'
93969393
if test "$enable_framework" ; then
@@ -9923,11 +9920,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext;;
99239920
esac
99249921

99259922
# Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
9926-
# However on SGI IRIX 4, these exist but are broken.
99279923
# BeOS' sockets are stashed in libnet.
9928-
case "$ac_sys_system" in
9929-
IRIX*) ;;
9930-
*)
99319924
echo "$as_me:$LINENO: checking for t_open in -lnsl" >&5
99329925
echo $ECHO_N "checking for t_open in -lnsl... $ECHO_C" >&6
99339926
if test "${ac_cv_lib_nsl_t_open+set}" = set; then
@@ -10044,8 +10037,7 @@ if test $ac_cv_lib_socket_socket = yes; then
1004410037
LIBS="-lsocket $LIBS"
1004510038
fi
1004610039
# SVR4 sockets
10047-
;;
10048-
esac
10040+
1004910041
case "$ac_sys_system" in
1005010042
BeOS*)
1005110043
echo "$as_me:$LINENO: checking for socket in -lnet" >&5
@@ -12071,69 +12063,6 @@ fi;
1207112063

1207212064
DLINCLDIR=.
1207312065

12074-
echo "$as_me:$LINENO: checking for --with-sgi-dl" >&5
12075-
echo $ECHO_N "checking for --with-sgi-dl... $ECHO_C" >&6
12076-
12077-
# Check whether --with-sgi-dl or --without-sgi-dl was given.
12078-
if test "${with_sgi_dl+set}" = set; then
12079-
withval="$with_sgi_dl"
12080-
12081-
echo "$as_me:$LINENO: result: $withval" >&5
12082-
echo "${ECHO_T}$withval" >&6
12083-
echo --with-sgi-dl is unsupported, see README
12084-
exit 1
12085-
12086-
cat >>confdefs.h <<\_ACEOF
12087-
#define WITH_SGI_DL 1
12088-
_ACEOF
12089-
12090-
DYNLOADFILE="dynload_dl.o"
12091-
dldir=$withval
12092-
if test ! -z "$dldir" -a -d "$dldir"
12093-
then LDFLAGS="$LDFLAGS -L$dldir"
12094-
else { { echo "$as_me:$LINENO: error: proper usage is --with-sgi-dl=DIRECTORY" >&5
12095-
echo "$as_me: error: proper usage is --with-sgi-dl=DIRECTORY" >&2;}
12096-
{ (exit 1); exit 1; }; }
12097-
fi
12098-
DLINCLDIR=${dldir}
12099-
LIBS="$LIBS -ldl -lmld"
12100-
else
12101-
echo "$as_me:$LINENO: result: no" >&5
12102-
echo "${ECHO_T}no" >&6
12103-
fi;
12104-
12105-
echo "$as_me:$LINENO: checking for --with-dl-dld" >&5
12106-
echo $ECHO_N "checking for --with-dl-dld... $ECHO_C" >&6
12107-
12108-
# Check whether --with-dl-dld or --without-dl-dld was given.
12109-
if test "${with_dl_dld+set}" = set; then
12110-
withval="$with_dl_dld"
12111-
12112-
echo "$as_me:$LINENO: result: $withval" >&5
12113-
echo "${ECHO_T}$withval" >&6
12114-
echo --with-dl-dld is unsupported, see README
12115-
exit 1
12116-
12117-
cat >>confdefs.h <<\_ACEOF
12118-
#define WITH_DL_DLD 1
12119-
_ACEOF
12120-
12121-
DYNLOADFILE="dynload_dl.o"
12122-
dldir=`echo "$withval" | sed 's/,.*//'`
12123-
dlddir=`echo "$withval" | sed 's/.*,//'`
12124-
if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
12125-
then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
12126-
else { { echo "$as_me:$LINENO: error: proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY" >&5
12127-
echo "$as_me: error: proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY" >&2;}
12128-
{ (exit 1); exit 1; }; }
12129-
fi
12130-
DLINCLDIR=${dldir}
12131-
LIBS="$LIBS -ldl -ldld"
12132-
else
12133-
echo "$as_me:$LINENO: result: no" >&5
12134-
echo "${ECHO_T}no" >&6
12135-
fi;
12136-
1213712066
# the dlopen() function means we might want to use dynload_shlib.o. some
1213812067
# platforms, such as AIX, have dlopen(), but don't want to use it.
1213912068

‎configure.in‎

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ AC_AIX
332332

333333
# Check for unsupported systems
334334
case $ac_sys_system/$ac_sys_release in
335-
SunOS/4*|DYNIX/*|IRIX/4*|Linux*/1*)
335+
SunOS/4*|Linux*/1*)
336336
echo This system \($ac_sys_system/$ac_sys_release\) is no longer supported.
337337
echo See README for details.
338338
exit 1;;
@@ -1246,7 +1246,6 @@ then
12461246
fi ;;
12471247
hp*|HP*) LDSHARED="ld -b";;
12481248
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
1249-
DYNIX/ptx*) LDSHARED="ld -G";;
12501249
Darwin/1.3*)
12511250
LDSHARED='$(CC) $(LDFLAGS) -bundle'
12521251
if test "$enable_framework" ; then
@@ -1443,15 +1442,10 @@ case "$ac_sys_system" in
14431442
esac
14441443

14451444
# Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
1446-
# However on SGI IRIX 4, these exist but are broken.
14471445
# BeOS' sockets are stashed in libnet.
1448-
case "$ac_sys_system" in
1449-
IRIX*) ;;
1450-
*)
14511446
AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
14521447
AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
1453-
;;
1454-
esac
1448+
14551449
case "$ac_sys_system" in
14561450
BeOS*)
14571451
AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS
@@ -1958,55 +1952,6 @@ fi],
19581952
AC_SUBST(DLINCLDIR)
19591953
DLINCLDIR=.
19601954

1961-
AC_MSG_CHECKING(for --with-sgi-dl)
1962-
AC_ARG_WITH(sgi-dl,
1963-
AC_HELP_STRING(--with-sgi-dl=DIRECTORY, IRIX 4 dynamic linking),
1964-
[
1965-
AC_MSG_RESULT($withval)
1966-
echo --with-sgi-dl is unsupported, see README
1967-
exit 1
1968-
AC_DEFINE(WITH_SGI_DL, 1,
1969-
[Define if you want to use SGI (IRIX 4) dynamic linking.
1970-
This requires the "dl" library by Jack Jansen,
1971-
ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
1972-
Do not bother on IRIX 5, it already has dynamic linking using SunOS
1973-
style shared libraries])
1974-
DYNLOADFILE="dynload_dl.o"
1975-
dldir=$withval
1976-
if test ! -z "$dldir" -a -d "$dldir"
1977-
then LDFLAGS="$LDFLAGS -L$dldir"
1978-
else AC_MSG_ERROR([proper usage is --with-sgi-dl=DIRECTORY])
1979-
fi
1980-
DLINCLDIR=${dldir}
1981-
LIBS="$LIBS -ldl -lmld"], AC_MSG_RESULT(no))
1982-
1983-
AC_MSG_CHECKING(for --with-dl-dld)
1984-
AC_ARG_WITH(dl-dld,
1985-
AC_HELP_STRING(--with-dl-dld=DL_DIR, GNU dynamic linking),
1986-
[
1987-
AC_MSG_RESULT($withval)
1988-
echo --with-dl-dld is unsupported, see README
1989-
exit 1
1990-
AC_DEFINE(WITH_DL_DLD, 1,
1991-
[Define if you want to emulate SGI (IRIX 4) dynamic linking.
1992-
This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
1993-
Sequent Symmetry (Dynix), and Atari ST.
1994-
This requires the 'dl-dld' library,
1995-
ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z,
1996-
as well as the 'GNU dld' library,
1997-
ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
1998-
Do not bother on SunOS 4 or 5, they already have dynamic linking using
1999-
shared libraries.])
2000-
DYNLOADFILE="dynload_dl.o"
2001-
dldir=`echo "$withval" | sed 's/,.*//'`
2002-
dlddir=`echo "$withval" | sed 's/.*,//'`
2003-
if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
2004-
then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
2005-
else AC_MSG_ERROR([proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY])
2006-
fi
2007-
DLINCLDIR=${dldir}
2008-
LIBS="$LIBS -ldl -ldld"], AC_MSG_RESULT(no))
2009-
20101955
# the dlopen() function means we might want to use dynload_shlib.o. some
20111956
# platforms, such as AIX, have dlopen(), but don't want to use it.
20121957
AC_CHECK_FUNCS(dlopen)

‎pyconfig.h.in‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -772,14 +772,6 @@
772772
/* Define if WINDOW in curses.h offers a field _flags. */
773773
#undef WINDOW_HAS_FLAGS
774774

775-
/* Define if you want to emulate SGI (IRIX 4) dynamic linking. This is
776-
rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4), Sequent Symmetry
777-
(Dynix), and Atari ST. This requires the 'dl-dld' library,
778-
ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z, as well as the 'GNU dld'
779-
library, ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z. Do not bother on
780-
SunOS 4 or 5, they already have dynamic linking using shared libraries. */
781-
#undef WITH_DL_DLD
782-
783775
/* Define if you want documentation strings in extension modules */
784776
#undef WITH_DOC_STRINGS
785777

@@ -798,12 +790,6 @@
798790
/* Define if you want to compile in Python-specific mallocs */
799791
#undef WITH_PYMALLOC
800792

801-
/* Define if you want to use SGI (IRIX 4) dynamic linking. This requires the
802-
"dl" library by Jack Jansen, ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z. Do
803-
not bother on IRIX 5, it already has dynamic linking using SunOS style
804-
shared libraries */
805-
#undef WITH_SGI_DL
806-
807793
/* Define if you want to compile in rudimentary thread support */
808794
#undef WITH_THREAD
809795

0 commit comments

Comments
 (0)