[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.37.2.2,1.37.2.3 PLAN.txt,1.1.2.34,1.1.2.35 configure,1.209.2.3,1.209.2.4 configure.in,1.217.2.3,1.217.2.4

2001年7月20日 23:07:44 -0700

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv27169/descr/dist/src
Modified Files:
 Tag: descr-branch
	Makefile.pre.in PLAN.txt configure configure.in 
Log Message:
Merge of trunk delta date2001-07-17b to date2001-07-21. See PLAN.txt.
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -C2 -r1.37.2.2 -r1.37.2.3
*** Makefile.pre.in	2001年07月07日 22:55:27	1.37.2.2
--- Makefile.pre.in	2001年07月21日 06:07:11	1.37.2.3
***************
*** 288,293 ****
 # Build the shared modules
 sharedmods: $(PYTHON)
! 	unset PYTHONPATH PYTHONHOME PYTHONSTARTUP; \
! 		./$(PYTHON) $(srcdir)/setup.py build
 
 # buildno should really depend on something like LIBRARY_SRC
--- 288,292 ----
 # Build the shared modules
 sharedmods: $(PYTHON)
! 	PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py build
 
 # buildno should really depend on something like LIBRARY_SRC
***************
*** 316,320 ****
 	$(RANLIB) $@
 
! # This rule is only here for DG/UX, UnixWare, and BeOS!!!
 libpython$(VERSION).so:	$(LIBRARY)
 	case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
--- 315,319 ----
 	$(RANLIB) $@
 
! # This rule is only here for DG/UX and BeOS!!!
 libpython$(VERSION).so:	$(LIBRARY)
 	case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
***************
*** 323,329 ****
 	 (cd dgux;ar x ../$^;ld -G -o ../$@ * ); \
 	 /bin/rm -rf ./dgux \
- 	 ;; \
- 	unixware*) \
- 	 $(LDSHARED) -o $@ $(LIBRARY_OBJS) \
 	 ;; \
 	beos) \
--- 322,325 ----
Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -C2 -r1.1.2.34 -r1.1.2.35
*** PLAN.txt	2001年07月19日 20:41:58	1.1.2.34
--- PLAN.txt	2001年07月21日 06:07:11	1.1.2.35
***************
*** 267,271 ****
--- 267,285 ----
 Merge details (this section is Tim's scratchpad, but should help a lot if
 he dies of frustration while wrestling with CVS <0.9 wink>).
+ ----------------------------------------------------------------------------
+ 2001年07月21日
+ 
+ Tagged trunk about 01:00 EDT:
+ cvs tag date2001-07-21 python
+ 
+ Merged trunk delta into branch:
+ cvs -q -z3 up -j date2001-07-17b -j date2001-07-21 descr
 
+ 4 conflicts, mostly RCS Id thingies. Resolved.
+ 
+ Legit failure in new test_repr, because repr.py dispatches on the exact
+ string returned by type(x). type(1L) and type('s') differ in descr-branch
+ now, and repr.py didn't realize that, falling back to the "unknown type"
+ case for longs and strings. Repaired descr-branch repr.py.
 ----------------------------------------------------------------------------
 2001年07月19日
***************
*** 287,294 ****
 Tagged trunk about 22:00 EDT, like so:
 cvs tag date2001-07-17b python
- 
- Problem: Can't build a working Windows installer. Leaving out the doc
- directory worms around that, and that's the best I can do. So the merge
- below also includes a fiddled install script that leaves out Doc/:
 
 Merged trunk delta into branch via:
--- 301,304 ----
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.209.2.3
retrieving revision 1.209.2.4
diff -C2 -r1.209.2.3 -r1.209.2.4
*** configure	2001年07月15日 20:26:55	1.209.2.3
--- configure	2001年07月21日 06:07:11	1.209.2.4
***************
*** 1,5 ****
 #! /bin/sh
 
! # From configure.in Revision: 1.227 
 
 # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
 #! /bin/sh
 
! # From configure.in Revision: 1.231 
 
[...5062 lines suppressed...]
 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
 echo $ac_n "(cached) $ac_c" 1>&6
 else
 cat > conftest.$ac_ext <<EOF
! #line 6956 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
***************
*** 6973,6977 ****
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6976: checking for build directories" >&5
 for dir in $SRCDIRS; do
 if test ! -d $dir; then
--- 7002,7006 ----
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7005: checking for build directories" >&5
 for dir in $SRCDIRS; do
 if test ! -d $dir; then
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.217.2.3
retrieving revision 1.217.2.4
diff -C2 -r1.217.2.3 -r1.217.2.4
*** configure.in	2001年07月15日 20:26:55	1.217.2.3
--- configure.in	2001年07月21日 06:07:12	1.217.2.4
***************
*** 53,59 ****
 then
 	ac_sys_system=`uname -s`
! 	if test "$ac_sys_system" = "AIX" -o \
! 		"$ac_sys_system" = "Monterey64" -o \
! 		"$ac_sys_system" = "UnixWare"; then
 		ac_sys_release=`uname -v`
 	else
--- 53,57 ----
 then
 	ac_sys_system=`uname -s`
! 	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then
 		ac_sys_release=`uname -v`
 	else
***************
*** 67,70 ****
--- 65,69 ----
 
 	case $MACHDEP in
+ 	cygwin*) MACHDEP="cygwin";;
 	'')	MACHDEP="unknown";;
 	esac
***************
*** 128,140 ****
 Monterey*)
 RANLIB=:
! 	 without_gcc=
! 	 ;;
! 	UnixWare*)
! 	 RANLIB=:
! 	 without_gcc=
! 	 ;;
! 	*)
! 	 without_gcc=no
! 	 ;;
 	esac])
 AC_MSG_RESULT($without_gcc)
--- 127,132 ----
 Monterey*)
 RANLIB=:
! without_gcc=;;
! 	*)	without_gcc=no;;
 	esac])
 AC_MSG_RESULT($without_gcc)
***************
*** 274,280 ****
 DLLLIBRARY='libpython$(VERSION).dll'
 ;;
- unixware*)
- LDLIBRARY='libpython$(VERSION).so'
- ;;
 esac
 AC_MSG_RESULT($LDLIBRARY)
--- 266,269 ----
***************
*** 386,390 ****
 
 # Check for enable-ipv6
! OPT="$OPT -Dss_family=__ss_family -Dss_len=__ss_len"
 AC_MSG_CHECKING([whether to enable ipv6])
 AC_ARG_ENABLE(ipv6,
--- 375,380 ----
 
 # Check for enable-ipv6
! # XXX definition of ss_family disabled until author clarifies rationale.
! # DEFS="$DEFS -Dss_family=__ss_family -Dss_len=__ss_len"
 AC_MSG_CHECKING([whether to enable ipv6])
 AC_ARG_ENABLE(ipv6,
***************
*** 530,533 ****
--- 520,541 ----
 fi
 
+ # -Kpthread, if available, provides the right #defines
+ # and linker options to make pthread_create available
+ AC_MSG_CHECKING(whether $CC accepts -Kpthread)
+ AC_CACHE_VAL(ac_cv_kpthread,
+ [ac_save_cc="$CC"
+ CC="$CC -Kpthread"
+ AC_TRY_LINK([#include <pthread.h>],[pthread_create(0,0,0,0)],
+ ac_cv_kpthread=yes,
+ ac_cv_kpthread=no)
+ CC="$ac_save_cc"])
+ 
+ # GCC does not reject -Kpthread as an illegal option, it merely complains that
+ # it is unrecognized
+ if test "$GCC" = "yes"
+ then ac_cv_kpthread="no, we have gcc"
+ fi
+ AC_MSG_RESULT($ac_cv_kpthread)
+ 
 dnl # check for ANSI or K&R ("traditional") preprocessor
 dnl AC_MSG_CHECKING(for C preprocessor type)
***************
*** 640,643 ****
--- 648,655 ----
 
 # if have pthread_t then define SIZEOF_PTHREAD_T
+ ac_save_cc="$CC"
+ if test "$ac_cv_kpthread" = "yes"
+ then CC="$CC -Kpthread"
+ fi
 AC_MSG_CHECKING(for pthread_t)
 have_pthread_t=no
***************
*** 661,665 ****
 AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t)
 fi
! 
 
 # Minor variations in building a framework between NextStep versions 4 and 5
--- 673,677 ----
 AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t)
 fi
! CC="$ac_save_cc"
 
 # Minor variations in building a framework between NextStep versions 4 and 5
***************
*** 779,783 ****
 		if test "$GCC" = "yes"
 		then LDSHARED="$(CC) -shared"
! 		else LDSHARED="ld -G -dy -Bdynamic"
 		fi;;
 	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
--- 791,795 ----
 		if test "$GCC" = "yes"
 		then LDSHARED="$(CC) -shared"
! 		else LDSHARED="$(CC) -G"
 		fi;;
 	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
***************
*** 809,813 ****
 		if test "$GCC" = "yes"
 		then CCSHARED="-fPIC"
! 		else CCSHARED="-KPIC -G -dy -Bdynamic"
 		fi;;
 	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
--- 821,825 ----
 		if test "$GCC" = "yes"
 		then CCSHARED="-fPIC"
! 		else CCSHARED="-KPIC"
 		fi;;
 	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
***************
*** 840,844 ****
 	next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
 	Darwin/*) LINKFORSHARED="-u __dummy -u _PyMac_Error -framework System -framework Foundation -framework Carbon" ;;
! 	UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";;
 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
 	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
--- 852,856 ----
 	next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
 	Darwin/*) LINKFORSHARED="-u __dummy -u _PyMac_Error -framework System -framework Foundation -framework Carbon" ;;
! 	UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
 	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
***************
*** 964,1048 ****
 then
 USE_THREAD_MODULE="#"
 else
! if test "$ac_sys_system" = "UnixWare"
! then
! 	CC="${CC} -Kthread"
! 	LIBOBJS="$LIBOBJS thread.o"
! 	AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	USE_THREAD_MODULE=""
! else
! 	if test ! -z "$with_threads" -a -d "$with_threads"
! 	then LDFLAGS="$LDFLAGS -L$with_threads"
! 	fi
! 	if test ! -z "$withval" -a -d "$withval"
! 	then LDFLAGS="$LDFLAGS -L$withval"
! 	fi
! 	AC_DEFINE(_REENTRANT)
! 	AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(C_THREADS)
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_MSG_CHECKING(for --with-pth)
! 	AC_ARG_WITH(pth,
! 	[ --with-pth use GNU pth threading libraries], [
! 	AC_MSG_RESULT($withval)
! 	AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(HAVE_PTH)
! 	LIBS="-lpth $LIBS"
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_MSG_RESULT(no)
! 	AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="-lpthread $LIBS"
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! 	case $ac_sys_system in
! 	 Darwin*) ;;
! 	 *) AC_DEFINE(_POSIX_THREADS);;
! 	esac
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(BEOS_THREADS)
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lpthreads"
! 	LIBOBJS="$LIBOBJS thread.o"], [
! 	AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lc_r"
! 	LIBOBJS="$LIBOBJS thread.o"], [
! 	AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lthread"
! 	LIBOBJS="$LIBOBJS thread.o"], [
! 	AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lpthread"
! 	LIBOBJS="$LIBOBJS thread.o"], [
! 	AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lcma"
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	USE_THREAD_MODULE="#"])
! 	])])])])])])])])])
! 
! 	AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
! 	LIBS="$LIBS -lmpc"
! 	LIBOBJS="$LIBOBJS thread.o"
! 	USE_THREAD_MODULE=""])
! 	AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
! 	LIBS="$LIBS -lthread"
! 	LIBOBJS="$LIBOBJS thread.o"
! 	USE_THREAD_MODULE=""])
! 
! 	if test "$USE_THREAD_MODULE" != "#"
! 	then
! 	 # If the above checks didn't disable threads, (at least) OSF1
! 	 # needs this '-threads' argument during linking.
! 	 case $ac_sys_system in
! 	 OSF1) LDLAST=-threads;;
! 	 esac
! 	fi
 fi
 fi
--- 976,1057 ----
 then
 USE_THREAD_MODULE="#"
+ elif test "$ac_cv_kpthread" = "yes"
+ then
+ CC="$CC -Kpthread"
+ AC_DEFINE(WITH_THREAD)
+ AC_DEFINE(_POSIX_THREADS)
+ LIBOBJS="$LIBOBJS thread.o"
 else
! if test ! -z "$with_threads" -a -d "$with_threads"
! then LDFLAGS="$LDFLAGS -L$with_threads"
! fi
! if test ! -z "$withval" -a -d "$withval"
! then LDFLAGS="$LDFLAGS -L$withval"
! fi
! AC_DEFINE(_REENTRANT)
! AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(C_THREADS)
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_MSG_CHECKING(for --with-pth)
! AC_ARG_WITH(pth,
! [ --with-pth use GNU pth threading libraries], [
! AC_MSG_RESULT($withval)
! AC_DEFINE(WITH_THREAD)
! AC_DEFINE(HAVE_PTH)
! LIBS="-lpth $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_MSG_RESULT(no)
! AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="-lpthread $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! case $ac_sys_system in
! Darwin*) ;;
! *) AC_DEFINE(_POSIX_THREADS);;
! esac
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(BEOS_THREADS)
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lpthreads"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lc_r"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lpthread"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lcma"
! LIBOBJS="$LIBOBJS thread.o"],[
! USE_THREAD_MODULE="#"])
! ])])])])])])])])])
! 
! AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lmpc"
! LIBOBJS="$LIBOBJS thread.o"
! USE_THREAD_MODULE=""])
! AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"
! USE_THREAD_MODULE=""])
! 
! if test "$USE_THREAD_MODULE" != "#"
! then
! # If the above checks didn't disable threads, (at least) OSF1
! # needs this '-threads' argument during linking.
! case $ac_sys_system in
! OSF1) LDLAST=-threads;;
! esac
 fi
 fi