+++ /dev/null
---- Python-2.3a2.orig/Makefile.pre.in Tue Jan 21 16:05:02 2003
-+++ Python-2.3a2/Makefile.pre.in Wed Apr 9 15:36:39 2003
-@@ -546,7 +546,7 @@
- @for i in X $(SHAREDMODS); do \
- if test $$i != X; then \
- echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
-- $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
-+ $(INSTALL_SHARED) $$i $(DESTDIR)$(DESTSHARED)/`basename $$i`; \
- fi; \
- done
-
-@@ -555,7 +555,7 @@
- do \
- if test ! -d $$i; then \
- echo "Creating directory $$i"; \
-- $(INSTALL) -d -m $(DIRMODE) $$i; \
-+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
- else true; \
- fi; \
- done
-@@ -563,11 +563,11 @@
-
- # Install the interpreter (by creating a hard link to python$(VERSION))
- bininstall: altbininstall
-- -if test -f $(BINDIR)/$(PYTHON) -o -L $(BINDIR)/$(PYTHON); \
-- then rm -f $(BINDIR)/$(PYTHON); \
-+ -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -L $(DESTDIR)$(BINDIR)/$(PYTHON); \
-+ then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
- else true; \
- fi
-- (cd $(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
-+ (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
-
- # Install the interpreter with $(VERSION) affixed
- # This goes into $(exec_prefix)
-@@ -582,16 +582,16 @@
- do \
- if test ! -d $$i; then \
- echo "Creating directory $$i"; \
-- $(INSTALL) -d -m $(DIRMODE) $$i; \
-+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
- else true; \
- fi; \
- done
-- $(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE)
-+ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
- if test -f libpython$(VERSION)$(SO); then \
- if test "$(SO)" = .dll; then \
-- $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(BINDIR); \
-+ $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(BINDIR); \
- else \
-- $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(LIBDIR)/$(INSTSONAME); \
-+ $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
- fi; \
- else true; \
- fi
-@@ -602,12 +602,12 @@
- do \
- if test ! -d $$i; then \
- echo "Creating directory $$i"; \
-- $(INSTALL) -d -m $(DIRMODE) $$i; \
-+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
- else true; \
- fi; \
- done
- $(INSTALL_DATA) $(srcdir)/Misc/python.man \
-- $(MANDIR)/man1/python.1
-+ $(DESTDIR)$(MANDIR)/man1/python.1
-
- # Install the library
- PLATDIR= plat-$(MACHDEP)
-@@ -631,7 +631,7 @@
- do \
- if test ! -d $$i; then \
- echo "Creating directory $$i"; \
-- $(INSTALL) -d -m $(DIRMODE) $$i; \
-+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
- else true; \
- fi; \
- done
-@@ -642,17 +642,17 @@
- b=$(LIBDEST)/$$d; \
- if test ! -d $$b; then \
- echo "Creating directory $$b"; \
-- $(INSTALL) -d -m $(DIRMODE) $$b; \
-+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$b; \
- else true; \
- fi; \
- done
- @for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc; \
- do \
- if test -x $$i; then \
-- $(INSTALL_SCRIPT) $$i $(LIBDEST); \
-+ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
- echo $(INSTALL_SCRIPT) $$i $(LIBDEST); \
- else \
-- $(INSTALL_DATA) $$i $(LIBDEST); \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(LIBDEST); \
- echo $(INSTALL_DATA) $$i $(LIBDEST); \
- fi; \
- done
-@@ -672,27 +672,27 @@
- if test -d $$i; then continue; fi; \
- if test -x $$i; then \
- echo $(INSTALL_SCRIPT) $$i $$b; \
-- $(INSTALL_SCRIPT) $$i $$b; \
-+ $(INSTALL_SCRIPT) $$i $(DESTDIR)$$b; \
- else \
- echo $(INSTALL_DATA) $$i $$b; \
-- $(INSTALL_DATA) $$i $$b; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$$b; \
- fi;; \
- esac; \
- done; \
- done
-- $(INSTALL_DATA) $(srcdir)/LICENSE $(LIBDEST)/LICENSE.txt
-+ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
- PYTHONPATH=$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -tt $(LIBDEST)/compileall.py \
-- -x 'badsyntax|site-packages' $(LIBDEST)
-+ ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-+ -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
- PYTHONPATH=$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -tt -O $(LIBDEST)/compileall.py \
-- -x 'badsyntax|site-packages' $(LIBDEST)
-+ ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
-+ -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
- PYTHONPATH=$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -t $(LIBDEST)/compileall.py \
-- -x badsyntax $(LIBDEST)/site-packages
-+ ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
-+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
- PYTHONPATH=$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -t -O $(LIBDEST)/compileall.py \
-- -x badsyntax $(LIBDEST)/site-packages
-+ ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
-+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
-@@ -711,16 +711,16 @@
- do \
- if test ! -d $$i; then \
- echo "Creating directory $$i"; \
-- $(INSTALL) -d -m $(DIRMODE) $$i; \
-+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
- else true; \
- fi; \
- done
- @for i in $(srcdir)/Include/*.h; \
- do \
- echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
-- $(INSTALL_DATA) $$i $(INCLUDEPY); \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
- done
-- $(INSTALL_DATA) pyconfig.h $(CONFINCLUDEPY)/pyconfig.h
-+ $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
-
- # Install the library and miscellaneous stuff needed for extending/embedding
- # This goes into $(exec_prefix)
-@@ -730,53 +730,53 @@
- do \
- if test ! -d $$i; then \
- echo "Creating directory $$i"; \
-- $(INSTALL) -d -m $(DIRMODE) $$i; \
-+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
- else true; \
- fi; \
- done
- @if test -d $(LIBRARY); then :; else \
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
- if test "$(SO)" = .dll; then \
-- $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL) ; \
-+ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- else \
-- $(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
-- $(RANLIB) $(LIBPL)/$(LIBRARY) ; \
-+ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
-+ $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- fi; \
- else \
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
- fi; \
- fi
-- $(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c
-- $(INSTALL_DATA) Modules/$(MAINOBJ) $(LIBPL)/$(MAINOBJ)
-- $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(LIBPL)/config.c.in
-- $(INSTALL_DATA) Makefile $(LIBPL)/Makefile
-- $(INSTALL_DATA) Modules/Setup $(LIBPL)/Setup
-- $(INSTALL_DATA) Modules/Setup.local $(LIBPL)/Setup.local
-- $(INSTALL_DATA) Modules/Setup.config $(LIBPL)/Setup.config
-- $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
-- $(INSTALL_SCRIPT) $(srcdir)/install-sh $(LIBPL)/install-sh
-+ $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
-+ $(INSTALL_DATA) Modules/$(MAINOBJ) $(DESTDIR)$(LIBPL)/$(MAINOBJ)
-+ $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
-+ $(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
-+ $(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
-+ $(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
-+ $(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
-+ $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
-+ $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
- @if [ -s Modules/python.exp -a \
- "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
- echo; echo "Installing support files for building shared extension modules on AIX:"; \
- $(INSTALL_DATA) Modules/python.exp \
-- $(LIBPL)/python.exp; \
-+ $(DESTDIR)$(LIBPL)/python.exp; \
- echo; echo "$(LIBPL)/python.exp"; \
- $(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \
-- $(LIBPL)/makexp_aix; \
-+ $(DESTDIR)$(LIBPL)/makexp_aix; \
- echo "$(LIBPL)/makexp_aix"; \
- $(INSTALL_SCRIPT) $(srcdir)/Modules/ld_so_aix \
-- $(LIBPL)/ld_so_aix; \
-+ $(DESTDIR)$(LIBPL)/ld_so_aix; \
- echo "$(LIBPL)/ld_so_aix"; \
- echo; echo "See Misc/AIX-NOTES for details."; \
- else true; \
- fi
- @case "$(MACHDEP)" in beos*) \
- echo; echo "Installing support files for building shared extension modules on BeOS:"; \
-- $(INSTALL_DATA) Misc/BeOS-NOTES $(LIBPL)/README; \
-+ $(INSTALL_DATA) Misc/BeOS-NOTES $(DESTDIR)$(LIBPL)/README; \
- echo; echo "$(LIBPL)/README"; \
-- $(INSTALL_SCRIPT) Modules/ar_beos $(LIBPL)/ar_beos; \
-+ $(INSTALL_SCRIPT) Modules/ar_beos $(DESTDIR)$(LIBPL)/ar_beos; \
- echo "$(LIBPL)/ar_beos"; \
-- $(INSTALL_SCRIPT) Modules/ld_so_beos $(LIBPL)/ld_so_beos; \
-+ $(INSTALL_SCRIPT) Modules/ld_so_beos $(DESTDIR)$(LIBPL)/ld_so_beos; \
- echo "$(LIBPL)/ld_so_beos"; \
- echo; echo "See Misc/BeOS-NOTES for details."; \
- ;; \
-@@ -788,7 +788,8 @@
- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
- --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
-- --install-platlib=$(DESTSHARED)
-+ --install-platlib=$(DESTSHARED) \
-+ --root=/$(DESTDIR)
-
- # Here are a couple of targets for MacOSX again, to install a full
- # framework-based Python. frameworkinstall installs everything, the
-@@ -852,14 +853,16 @@
- --check-tkinter \
- --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
-- --install-platlib=$(DESTSHARED)
-+ --install-platlib=$(DESTSHARED) \
-+ --root=/$(DESTDIR)
-
- # This installs a few of the useful scripts in Tools/scripts
- scriptsinstall:
- SRCDIR=$(srcdir) $(RUNSHARED) \
- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
- --prefix=$(prefix) \
-- --install-scripts=$(BINDIR)
-+ --install-scripts=$(BINDIR) \
-+ --root=/$(DESTDIR)
-
- # Build the toplevel Makefile
- Makefile.pre: Makefile.pre.in config.status
+++ /dev/null
---- Python-2.2.1/configure.in.orig Fri Apr 19 20:16:38 2002
-+++ Python-2.2.1/configure.in Fri Apr 19 20:28:11 2002
-@@ -1017,13 +1017,13 @@
- # Defining _REENTRANT on system with POSIX threads should not hurt.
- AC_DEFINE(_REENTRANT)
- posix_threads=yes
-- LIBOBJS="$LIBOBJS thread.o"
-+ AC_LIBOBJ([thread])
- elif test "$ac_cv_kpthread" = "yes"
- then
- CC="$CC -Kpthread"
- AC_DEFINE(WITH_THREAD)
- posix_threads=yes
-- LIBOBJS="$LIBOBJS thread.o"
-+ AC_LIBOBJ([thread])
- else
- if test ! -z "$with_threads" -a -d "$with_threads"
- then LDFLAGS="$LDFLAGS -L$with_threads"
-@@ -1048,11 +1048,11 @@
- AC_DEFINE(C_THREADS)
- AC_DEFINE(HURD_C_THREADS)
- LIBS="$LIBS -lthreads"
-- LIBOBJS="$LIBOBJS thread.o"],[
-+ AC_LIBOBJ([thread.o])],[
- AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
- AC_DEFINE(C_THREADS)
- AC_DEFINE(MACH_C_THREADS)
-- LIBOBJS="$LIBOBJS thread.o"],[
-+ AC_LIBOBJ([thread])],[
- AC_MSG_CHECKING(for --with-pth)
- AC_ARG_WITH(pth,
- [ --with-pth use GNU pth threading libraries], [
-@@ -1060,7 +1060,7 @@
- AC_DEFINE(WITH_THREAD)
- AC_DEFINE(HAVE_PTH)
- LIBS="-lpth $LIBS"
-- LIBOBJS="$LIBOBJS thread.o"],[
-+ AC_LIBOBJ([thread])],[
- AC_MSG_RESULT(no)
-
- # Just looking for pthread_create in libpthread is not enough:
-@@ -1076,34 +1076,34 @@
- AC_MSG_RESULT(yes)
- AC_DEFINE(WITH_THREAD)
- posix_threads=yes
-- LIBOBJS="$LIBOBJS thread.o"],[
-+ AC_LIBOBJ([thread])],[
- LIBS=$_libs
- AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
- posix_threads=yes
-- LIBOBJS="$LIBOBJS thread.o"],[
-+ AC_LIBOBJ([thread])],[
- AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
- AC_DEFINE(BEOS_THREADS)
-- LIBOBJS="$LIBOBJS thread.o"],[
-+ AC_LIBOBJ([thread])],[
- AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
- posix_threads=yes
- LIBS="$LIBS -lpthreads"
-- LIBOBJS="$LIBOBJS thread.o"], [
-+ AC_LIBOBJ([thread])], [
- AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
- posix_threads=yes
- LIBS="$LIBS -lc_r"
-- LIBOBJS="$LIBOBJS thread.o"], [
-+ AC_LIBOBJ([thread])], [
- AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
- posix_threads=yes
- LIBS="$LIBS -lthread"
-- LIBOBJS="$LIBOBJS thread.o"], [
-+ AC_LIBOBJ([thread])], [
- AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
- posix_threads=yes
- LIBS="$LIBS -lpthread"
-- LIBOBJS="$LIBOBJS thread.o"], [
-+ AC_LIBOBJ([thread])], [
- AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
- posix_threads=yes
- LIBS="$LIBS -lcma"
-- LIBOBJS="$LIBOBJS thread.o"],[
-+ AC_LIBOBJ([thread])],[
- USE_THREAD_MODULE="#"])
- ])])])])])])])])])])
-
-@@ -1139,11 +1139,11 @@
-
- AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
- LIBS="$LIBS -lmpc"
-- LIBOBJS="$LIBOBJS thread.o"
-+ AC_LIBOBJ([thread])
- USE_THREAD_MODULE=""])
- AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
- LIBS="$LIBS -lthread"
-- LIBOBJS="$LIBOBJS thread.o"
-+ AC_LIBOBJ([thread])
- USE_THREAD_MODULE=""])
-
- if test "$USE_THREAD_MODULE" != "#"
-@@ -2037,11 +2037,11 @@
- EOF
- AC_CHECK_TYPE(socklen_t, int)
-
--# Add Python/ prefix to LIBOBJS
--libobjs=$LIBOBJS
--LIBOBJS=
-+# Add Python/ prefix to LIB@&t@OBJS
-+libobjs=$LIB@&t@OBJS
-+LIB@&t@OBJS=
- for obj in $libobjs; do
-- LIBOBJS="$LIBOBJS Python/$obj"
-+ LIB@&t@OBJS="$LIB@&t@OBJS Python/$obj"
- done
-
- #AC_MSG_CHECKING(for Modules/Setup)
+++ /dev/null
-diff -ruN Python-2.2.2/Demo.orig/tix/samples/Balloon.py Python-2.2.2/Demo/tix/samples/Balloon.py
---- Python-2.2.2/Demo.orig/tix/samples/Balloon.py Fri May 16 13:01:40 2003
-+++ Python-2.2.2/Demo/tix/samples/Balloon.py Fri May 16 13:34:29 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # $Id$
- #
-diff -ruN Python-2.2.2/Demo.orig/tix/samples/BtnBox.py Python-2.2.2/Demo/tix/samples/BtnBox.py
---- Python-2.2.2/Demo.orig/tix/samples/BtnBox.py Fri May 16 13:01:40 2003
-+++ Python-2.2.2/Demo/tix/samples/BtnBox.py Fri May 16 13:34:29 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # $Id$
- #
-diff -ruN Python-2.2.2/Demo.orig/tix/samples/CmpImg.py Python-2.2.2/Demo/tix/samples/CmpImg.py
---- Python-2.2.2/Demo.orig/tix/samples/CmpImg.py Fri May 16 13:01:40 2003
-+++ Python-2.2.2/Demo/tix/samples/CmpImg.py Fri May 16 13:34:29 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # $Id$
- #
-diff -ruN Python-2.2.2/Demo.orig/tix/samples/ComboBox.py Python-2.2.2/Demo/tix/samples/ComboBox.py
---- Python-2.2.2/Demo.orig/tix/samples/ComboBox.py Fri May 16 13:01:40 2003
-+++ Python-2.2.2/Demo/tix/samples/ComboBox.py Fri May 16 13:34:29 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # $Id$
- #
-diff -ruN Python-2.2.2/Demo.orig/tix/samples/Control.py Python-2.2.2/Demo/tix/samples/Control.py
---- Python-2.2.2/Demo.orig/tix/samples/Control.py Fri May 16 13:01:40 2003
-+++ Python-2.2.2/Demo/tix/samples/Control.py Fri May 16 13:34:29 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # $Id$
- #
-diff -ruN Python-2.2.2/Demo.orig/tix/samples/NoteBook.py Python-2.2.2/Demo/tix/samples/NoteBook.py
---- Python-2.2.2/Demo.orig/tix/samples/NoteBook.py Fri May 16 13:01:40 2003
-+++ Python-2.2.2/Demo/tix/samples/NoteBook.py Fri May 16 13:34:29 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # $Id$
- #
-diff -ruN Python-2.2.2/Demo.orig/tix/samples/OptMenu.py Python-2.2.2/Demo/tix/samples/OptMenu.py
---- Python-2.2.2/Demo.orig/tix/samples/OptMenu.py Fri May 16 13:01:40 2003
-+++ Python-2.2.2/Demo/tix/samples/OptMenu.py Fri May 16 13:34:29 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # $Id$
- #
-diff -ruN Python-2.2.2/Demo.orig/tix/samples/Tree.py Python-2.2.2/Demo/tix/samples/Tree.py
---- Python-2.2.2/Demo.orig/tix/samples/Tree.py Fri May 16 13:01:40 2003
-+++ Python-2.2.2/Demo/tix/samples/Tree.py Fri May 16 13:34:29 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # $Id$
- #
-diff -ruN Python-2.2.2/Tools.orig/scripts/parseentities.py Python-2.2.2/Tools/scripts/parseentities.py
---- Python-2.2.2/Tools.orig/scripts/parseentities.py Fri May 16 13:01:47 2003
-+++ Python-2.2.2/Tools/scripts/parseentities.py Fri May 16 13:34:49 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- """ Utility for parsing HTML entity definitions available from:
-
- http://www.w3.org/ as e.g.
+++ /dev/null
-diff -urN Python-2.3.1.org/configure.in Python-2.3.1/configure.in
---- Python-2.3.1.org/configure.in 2003-09-27 12:45:29.550715080 +0200
-+++ Python-2.3.1/configure.in 2003-09-27 12:45:53.014148096 +0200
-@@ -2093,7 +2093,7 @@
- )
- AC_MSG_CHECKING(for fsync)
- AC_TRY_COMPILE([#include <unistd.h>], void *x=fsync,
-- AC_DEFINE(HAVE_SYNC, 1, Define if you have the 'fsync' function.)
-+ AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.)
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no)
- )
-diff -urN Python-2.3.1.org/pyconfig.h.in Python-2.3.1/pyconfig.h.in
---- Python-2.3.1.org/pyconfig.h.in 2003-09-27 12:45:29.623703984 +0200
-+++ Python-2.3.1/pyconfig.h.in 2003-09-27 12:46:09.172691624 +0200
-@@ -486,7 +486,7 @@
- #undef HAVE_SYMLINK
-
- /* Define if you have the 'fsync' function. */
--#undef HAVE_SYNC
-+#undef HAVE_FSYNC
-
- /* Define to 1 if you have the `sysconf' function. */
- #undef HAVE_SYSCONF
+++ /dev/null
---- Python-2.3b1.orig/Makefile.pre.in Thu May 15 16:33:02 2003
-+++ Python-2.3b1/Makefile.pre.in Thu May 15 16:39:06 2003
-@@ -864,6 +864,7 @@
- --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
- --install-platlib=$(DESTSHARED) \
-+ --optimize=2 \
- --root=/$(DESTDIR)
-
- # This installs a few of the useful scripts in Tools/scripts
+++ /dev/null
-# -*- makefile -*-
-# The file Setup is used by the makesetup script to construct the files
-# Makefile and config.c, from Makefile.pre and config.c.in,
-# respectively. The file Setup itself is initially copied from
-# Setup.dist; once it exists it will not be overwritten, so you can edit
-# Setup to your heart's content. Note that Makefile.pre is created
-# from Makefile.pre.in by the toplevel configure script.
-
-# (VPATH notes: Setup and Makefile.pre are in the build directory, as
-# are Makefile and config.c; the *.in and *.dist files are in the source
-# directory.)
-
-# Each line in this file describes one or more optional modules.
-# Modules enabled here will not be compiled by the setup.py script,
-# so the file can be used to override setup.py's behavior.
-
-# Lines have the following structure:
-#
-# <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
-#
-# <sourcefile> is anything ending in .c (.C, .cc, .c++ are C++ files)
-# <cpparg> is anything starting with -I, -D, -U or -C
-# <library> is anything ending in .a or beginning with -l or -L
-# <module> is anything else but should be a valid Python
-# identifier (letters, digits, underscores, beginning with non-digit)
-#
-# (As the makesetup script changes, it may recognize some other
-# arguments as well, e.g. *.so and *.sl as libraries. See the big
-# case statement in the makesetup script.)
-#
-# Lines can also have the form
-#
-# <name> = <value>
-#
-# which defines a Make variable definition inserted into Makefile.in
-#
-# Finally, if a line contains just the word "*shared*" (without the
-# quotes but with the stars), then the following modules will not be
-# included in the config.c file, nor in the list of objects to be
-# added to the library archive, and their linker options won't be
-# added to the linker options, but rules to create their .o files and
-# their shared libraries will still be added to the Makefile, and
-# their names will be collected in the Make variable SHAREDMODS. This
-# is used to build modules as shared libraries. (They can be
-# installed using "make sharedinstall", which is implied by the
-# toplevel "make install" target.) (For compatibility,
-# *noconfig* has the same effect as *shared*.)
-#
-# In addition, *static* reverses this effect (negating a previous
-# *shared* line).
-
-# NOTE: As a standard policy, as many modules as can be supported by a
-# platform should be present. The distribution comes with all modules
-# enabled that are supported by most platforms and don't require you
-# to ftp sources from elsewhere.
-
-
-# Some special rules to define PYTHONPATH.
-# Edit the definitions below to indicate which options you are using.
-# Don't add any whitespace or comments!
-
-# Directories where library files get installed.
-# DESTLIB is for Python modules; MACHDESTLIB for shared libraries.
-DESTLIB=$(LIBDEST)
-MACHDESTLIB=$(BINLIBDEST)
-
-# NOTE: all the paths are now relative to the prefix that is computed
-# at run time!
-
-# Standard path -- don't edit.
-# No leading colon since this is the first entry.
-# Empty since this is now just the runtime prefix.
-DESTPATH=
-
-# Site specific path components -- should begin with : if non-empty
-SITEPATH=
-
-# Standard path components for test modules
-TESTPATH=
-
-# Path components for machine- or system-dependent modules and shared libraries
-MACHDEPPATH=:plat-$(MACHDEP)
-
-# Path component for the Tkinter-related modules
-# The TKPATH variable is always enabled, to save you the effort.
-TKPATH=:lib-tk
-
-COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH)
-PYTHONPATH=$(COREPYTHONPATH)
-
-
-# The modules listed here can't be built as shared libraries for
-# various reasons; therefore they are listed here instead of in the
-# normal order.
-
-# This only contains the minimal set of modules required to run the
-# setup.py script in the root of the Python source tree.
-
-posix posixmodule.c # posix (UNIX) system calls
-_sre _sre.c # Fredrik Lundh's new regular expressions
-new newmodule.c # Tommy Burnette's 'new' module
-
-# The rest of the modules listed in this file are all commented out by
-# default. Usually they can be detected and built as dynamically
-# loaded modules by the new setup.py script added in Python 2.1. If
-# you're on a platform that doesn't support dynamic loading, want to
-# compile modules statically into the Python binary, or need to
-# specify some odd set of compiler switches, you can uncomment the
-# appropriate lines below.
-
-# ======================================================================
-
-# The Python symtable module depends on .h files that setup.py doesn't track
-_symtable symtablemodule.c
-
-# The SGI specific GL module:
-
-GLHACK=-Dclear=__GLclear
-#gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11
-
-# Pure module. Cannot be linked dynamically.
-# -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE
-#WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE
-#PURE_INCLS=-I/usr/local/include
-#PURE_STUBLIBS=-L/usr/local/lib -lpurify_stubs -lquantify_stubs
-#pure puremodule.c $(WHICH_PURE_PRODUCTS) $(PURE_INCLS) $(PURE_STUBLIBS)
-
-# Uncommenting the following line tells makesetup that all following
-# modules are to be built as shared libraries (see above for more
-# detail; also note that *static* reverses this effect):
-
-*shared*
-
-# GNU readline. Unlike previous Python incarnations, GNU readline is
-# now incorporated in an optional module, configured in the Setup file
-# instead of by a configure script switch. You may have to insert a
-# -L option pointing to the directory where libreadline.* lives,
-# and you may have to change -ltermcap to -ltermlib or perhaps remove
-# it, depending on your system -- see the GNU readline instructions.
-# It's okay for this to be a shared library, too.
-
-readline readline.c -lreadline
-
-
-# Modules that should always be present (non UNIX dependent):
-
-array arraymodule.c # array objects
-cmath cmathmodule.c # -lm # complex math library functions
-math mathmodule.c # -lm # math library functions, e.g. sin()
-struct structmodule.c # binary structure packing/unpacking
-time timemodule.c # -lm # time operations and variables
-operator operator.c # operator.add() and similar goodies
-_weakref _weakref.c # basic weak reference support
-_codecs _codecsmodule.c # access to the builtin codecs and codec registry
-_testcapi _testcapimodule.c # Python C API test module
-
-unicodedata unicodedata.c # static Unicode character database
-
-_locale _localemodule.c # access to ISO C locale support
-
-
-# Modules with some UNIX dependencies -- on by default:
-# (If you have a really backward UNIX, select and socket may not be
-# supported...)
-
-fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
-pwd pwdmodule.c # pwd(3)
-grp grpmodule.c # grp(3)
-errno errnomodule.c # posix (UNIX) errno values
-select selectmodule.c # select(2); not on ancient System V
-
-# Memory-mapped files (also works on Win32).
-mmap mmapmodule.c
-
-# Dynamic readlines
-xreadlines xreadlinesmodule.c
-
-# for socket(2), without SSL support.
-_socket socketmodule.c
-
-# Socket module compiled with SSL support; you must comment out the other
-# socket line above, and possibly edit the SSL variable:
-#SSL=/usr/local/ssl
-_socket socketmodule.c \
- -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
- -L$(SSL)/lib -lssl -lcrypto
-
-# The crypt module is now disabled by default because it breaks builds
-# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
-#
-# First, look at Setup.config; configure may have set this for you.
-
-crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
-
-
-# Some more UNIX dependent modules -- off by default, since these
-# are not supported by all UNIX systems:
-
-nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
-termios termios.c # Steen Lumholt's termios module
-resource resource.c # Jeremy Hylton's rlimit interface
-
-
-# Multimedia modules -- off by default.
-# These don't work for 64-bit platforms!!!
-# These represent audio samples or images as strings:
-
-audioop audioop.c # Operations on audio samples
-imageop imageop.c # Operations on images
-rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably)
-
-
-# The md5 module implements the RSA Data Security, Inc. MD5
-# Message-Digest Algorithm, described in RFC 1321. The necessary files
-# md5c.c and md5.h are included here.
-
-md5 md5module.c md5c.c
-
-
-# The sha module implements the SHA checksum algorithm.
-# (NIST's Secure Hash Algorithm.)
-sha shamodule.c
-
-
-# The mpz module interfaces to the GNU Multiple Precision library.
-# You need to ftp the GNU MP library.
-# The GMP variable must point to the GMP source directory.
-# This was originally written and tested against GMP 1.2 and 1.3.2.
-# It has been modified by Rob Hooft to work with 2.0.2 as well, but I
-# haven't tested it recently.
-
-# A compatible MP library unencombered by the GPL also exists. It was
-# posted to comp.sources.misc in volume 40 and is widely available from
-# FTP archive sites. One URL for it is:
-# ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
-
-#GMP=/ufs/guido/src/gmp
-mpz mpzmodule.c -lgmp -D__GNU_MP__=2
-
-
-# SGI IRIX specific modules -- off by default.
-
-# These module work on any SGI machine:
-
-# *** gl must be enabled higher up in this file ***
-#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager
-#sgi sgimodule.c # sgi.nap() and a few more
-
-# This module requires the header file
-# /usr/people/4Dgifts/iristools/include/izoom.h:
-#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities
-
-
-# These modules require the Multimedia Development Option (I think):
-
-#al almodule.c -laudio # Audio Library
-#cd cdmodule.c -lcdaudio -lds -lmediad # CD Audio Library
-#cl clmodule.c -lcl -lawareaudio # Compression Library
-#sv svmodule.c yuvconvert.c -lsvideo -lXext -lX11 # Starter Video
-
-
-# The FORMS library, by Mark Overmars, implements user interface
-# components such as dialogs and buttons using SGI's GL and FM
-# libraries. You must ftp the FORMS library separately from
-# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a.
-# NOTE: if you want to be able to use FORMS and curses simultaneously
-# (or both link them statically into the same binary), you must
-# compile all of FORMS with the cc option "-Dclear=__GLclear".
-
-# The FORMS variable must point to the FORMS subdirectory of the forms
-# toplevel directory:
-
-#FORMS=/ufs/guido/src/forms/FORMS
-#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl
-
-
-# SunOS specific modules -- off by default:
-
-#sunaudiodev sunaudiodev.c
-
-
-# A Linux specific module -- off by default; this may also work on
-# some *BSDs.
-
-#linuxaudiodev linuxaudiodev.c
-
-
-# George Neville-Neil's timing module:
-
-timing timingmodule.c
-
-
-# The _tkinter module.
-#
-# The command for _tkinter is long and site specific. Please
-# uncomment and/or edit those parts as indicated. If you don't have a
-# specific extension (e.g. Tix or BLT), leave the corresponding line
-# commented out. (Leave the trailing backslashes in! If you
-# experience strange errors, you may want to join all uncommented
-# lines and remove the backslashes -- the backslash interpretation is
-# done by the shell's "read" command and it may not be implemented on
-# every system.
-
-# *** Always uncomment this (leave the leading underscore in!):
-_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
- -L/usr/X11R6/lib \
- -I/usr/X11R6/include \
- -ltk -ltcl \
- -lX11
-
-# Lance Ellinghaus's modules:
-
-rotor rotormodule.c # enigma-inspired encryption
-syslog syslogmodule.c # syslog daemon interface
-
-
-# Curses support, requring the System V version of curses, often
-# provided by the ncurses library. e.g. on Linux, link with -lncurses
-# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
-# -L/usr/5lib before -lcurses).
-#
-# First, look at Setup.config; configure may have set this for you.
-
-_curses _cursesmodule.c -I/usr/include/ncurses -lncurses
-# Wrapper for the panel library that's part of ncurses and SYSV curses.
-_curses_panel _curses_panel.c -I/usr/include/ncurses -lpanel -lncurses
-
-
-# Generic (SunOS / SVR4) dynamic loading module.
-# This is not needed for dynamic loading of Python modules --
-# it is a highly experimental and dangerous device for calling
-# *arbitrary* C functions in *arbitrary* shared libraries:
-
-#dl dlmodule.c
-
-
-# Modules that provide persistent dictionary-like semantics. You will
-# probably want to arrange for at least one of them to be available on
-# your machine, though none are defined by default because of library
-# dependencies. The Python module anydbm.py provides an
-# implementation independent wrapper for these; dumbdbm.py provides
-# similar functionality (but slower of course) implemented in Python.
-
-# The standard Unix dbm module has been moved to Setup.config so that
-# it will be compiled as a shared library by default. Compiling it as
-# a built-in module causes conflicts with the pybsddb3 module since it
-# creates a static dependency on an out-of-date version of db.so.
-#
-# First, look at Setup.config; configure may have set this for you.
-
-#dbm dbmmodule.c # dbm(3) may require -lndbm or similar
-
-# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
-#
-# First, look at Setup.config; configure may have set this for you.
-
-gdbm gdbmmodule.c -lgdbm
-
-
-# Berkeley DB interface.
-#
-# This requires the Berkeley DB code, see
-# ftp://ftp.cs.berkeley.edu/pub/4bsd/db.1.85.tar.gz
-#
-# Edit the variables DB and DBPORT to point to the db top directory
-# and the subdirectory of PORT where you built it.
-#
-# (See http://electricrain.com/greg/python/bsddb3/ for an interface to
-# BSD DB 3.x.)
-
-# Note: If a db.h file is found by configure, bsddb will be enabled
-# automatically via Setup.config.in. It only needs to be enabled here
-# if it is not automatically enabled there; check the generated
-# Setup.config before enabling it here.
-
-#DB=/depot/sundry/src/berkeley-db/db.1.85
-#DBPORT=$(DB)/PORT/irix.5.3
-bsddb bsddbmodule.c -ldb
-
-
-
-# Helper module for various ascii-encoders
-binascii binascii.c
-
-# Fred Drake's interface to the Python parser
-parser parsermodule.c
-
-# Digital Creations' cStringIO and cPickle
-cStringIO cStringIO.c
-cPickle cPickle.c
-
-
-# Lee Busby's SIGFPE modules.
-# The library to link fpectl with is platform specific.
-# Choose *one* of the options below for fpectl:
-
-# For SGI IRIX (tested on 5.3):
-#fpectl fpectlmodule.c -lfpe
-
-# For Solaris with SunPro compiler (tested on Solaris 2.5 with SunPro C 4.2):
-# (Without the compiler you don't have -lsunmath.)
-#fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm
-
-# For other systems: see instructions in fpectlmodule.c.
-#fpectl fpectlmodule.c ...
-
-# Test module for fpectl. No extra libraries needed.
-#fpetest fpetestmodule.c
-
-# Andrew Kuchling's zlib module.
-# This require zlib 1.1.3 (or later).
-# See http://www.cdrom.com/pub/infozip/zlib/
-zlib zlibmodule.c -lz
-
-# Interface to the Expat XML parser
-#
-# Expat is written by James Clark and must be downloaded separately
-# (see below). The pyexpat module was written by Paul Prescod after a
-# prototype by Jack Jansen.
-#
-# The Expat dist includes Windows .lib and .dll files. Home page is at
-# http://www.jclark.com/xml/expat.html, the current production release is
-# always ftp://ftp.jclark.com/pub/xml/expat.zip.
-#
-# EXPAT_DIR, below, should point to the expat/ directory created by
-# unpacking the Expat source distribution.
-#
-# Note: the expat build process doesn't yet build a libexpat.a; you can
-# do this manually while we try convince the author to add it. To do so,
-# cd to EXPAT_DIR, run "make" if you have not done so, then run:
-#
-# ar cr libexpat.a xmltok/*.o xmlparse/*.o
-#
-#EXPAT_DIR=/usr/local/src/expat
-pyexpat pyexpat.c -lexpat -DHAVE_EXPAT_H
-
-
-# Example -- included for reference only:
-# xx xxmodule.c
-
-# Another example -- the 'xxsubtype' module shows C-level subtyping in action
-xxsubtype xxsubtype.c
+++ /dev/null
-diff -Nur Python-2.2.2.orig/Makefile.pre.in Python-2.2.2/Makefile.pre.in
---- Python-2.2.2.orig/Makefile.pre.in Fri Aug 23 18:05:49 2002
-+++ Python-2.2.2/Makefile.pre.in Thu Oct 17 12:04:40 2002
-@@ -25,6 +25,7 @@
-
- # === Variables set by configure
- VERSION= @VERSION@
-+SOVERSION= @SOVERSION@
- srcdir= @srcdir@
- VPATH= @srcdir@
-
-@@ -65,7 +66,7 @@
- # Extra C flags added for building the interpreter object files.
- CFLAGSFORSHARED=@CFLAGSFORSHARED@
- # C flags used for building the interpreter object files
--PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED)
-+PY_CFLAGS= $(CFLAGS) $(CPPFLAGS)
-
-
- # Machine-dependent subdirectories
-@@ -97,6 +98,7 @@
- LDSHARED= @LDSHARED@
- BLDSHARED= @BLDSHARED@
- DESTSHARED= $(BINLIBDEST)/lib-dynload
-+RUNSHARED= LD_PRELOAD=./$(LDLIBRARY)
-
- # Executable suffix (.exe on Windows and Mac OS X)
- EXE= @EXEEXT@
-@@ -288,7 +290,7 @@
- # Rules
-
- # Default target
--all: $(BUILDPYTHON) oldsharedmods sharedmods
-+all: $(BUILDPYTHON) $(LIBRARY) oldsharedmods sharedmods
-
- # Build the interpreter
- $(BUILDPYTHON): Modules/$(MAINOBJ) $(LDLIBRARY)
-@@ -297,14 +299,14 @@
- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-
- platform: $(BUILDPYTHON)
-- ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-+ $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-
-
- # Build the shared modules
- sharedmods: $(BUILDPYTHON)
- case $$MAKEFLAGS in \
-- *-s*) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-- *) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
- esac
-
- # buildno should really depend on something like LIBRARY_SRC
-@@ -332,6 +334,20 @@
- $(AR) cr $@ $(MODOBJS)
- $(RANLIB) $@
-
-+# WARNING: The following is only tested for Debian GNU/Linux.
-+# This rule is silly and needs to be cleaned up ASAP!
-+# Gregor Hoffleit <flight@debian.org>
-+#
-+# This rule is here for Linux shared libs
-+# The PIC code will be built additionally to the static lib!
-+libpython$(VERSION).so.$(SOVERSION): $(LIBRARY_OBJS:%.o=%.pic_o)
-+ case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
-+ *linux*|*gnu*) \
-+ $(CC) -shared -Wl,-soname,$@ -o $@ $(LIBRARY_OBJS:%.o=%.pic_o) \
-+ $(LIBS) $(LIBM) \
-+ ;; \
-+ esac
-+
- # 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 \
-@@ -391,6 +407,9 @@
- Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno
- $(CC) -c $(PY_CFLAGS) -DBUILD=`cat buildno` -o $@ $(srcdir)/Modules/getbuildinfo.c
-
-+Modules/getbuildinfo.pic_o: $(srcdir)/Modules/getbuildinfo.c buildno
-+ $(CC) -c $(PY_CFLAGS) $(CCSHARED) -DBUILD=`cat buildno` -o $@ $(srcdir)/Modules/getbuildinfo.c
-+
- Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
- $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
- -DPREFIX='"$(prefix)"' \
-@@ -399,9 +418,20 @@
- -DVPATH='"$(VPATH)"' \
- -o $@ $(srcdir)/Modules/getpath.c
-
-+Modules/getpath.pic_o: $(srcdir)/Modules/getpath.c Makefile
-+ $(CC) -c $(PY_CFLAGS) $(CCSHARED) -DPYTHONPATH='"$(PYTHONPATH)"' \
-+ -DPREFIX='"$(prefix)"' \
-+ -DEXEC_PREFIX='"$(exec_prefix)"' \
-+ -DVERSION='"$(VERSION)"' \
-+ -DVPATH='"$(VPATH)"' \
-+ -o $@ $(srcdir)/Modules/getpath.c
-+
- Modules/ccpython.o: $(srcdir)/Modules/ccpython.cc
- $(CXX) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/ccpython.cc
-
-+Modules/ccpython.pic_o: $(srcdir)/Modules/ccpython.cc
-+ $(CXX) -c $(PY_CFLAGS) $(CCSHARED) -o $@ $(srcdir)/Modules/ccpython.cc
-+
-
- $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-@@ -420,9 +450,15 @@
- Python/getplatform.o: $(srcdir)/Python/getplatform.c
- $(CC) -c $(CFLAGS) $(CPPFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
-
-+Python/getplatform.pic_o: $(srcdir)/Python/getplatform.c
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CCSHARED) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
-+
- Python/importdl.o: $(srcdir)/Python/importdl.c
- $(CC) -c $(CFLAGS) $(CPPFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-
-+Python/importdl.pic_o: $(srcdir)/Python/importdl.c
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CCSHARED) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-+
- Objects/object.o: $(srcdir)/Objects/object.c $(srcdir)/Objects/obmalloc.c
-
- Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
-@@ -486,7 +522,7 @@
- # Test the interpreter (twice, once without .pyc files, once with)
- TESTOPTS= -l
- TESTPROG= $(srcdir)/Lib/test/regrtest.py
--TESTPYTHON= ./$(BUILDPYTHON) -E -tt
-+TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -tt
- test: all platform
- -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
- -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
-@@ -556,6 +592,12 @@
- fi; \
- done
- $(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE)
-+ if test -f libpython$(VERSION).so.$(SOVERSION); then \
-+ mkdir $(LIBDIR); \
-+ $(INSTALL_DATA) libpython$(VERSION).so.$(SOVERSION) $(LIBDIR); \
-+ (cd $(LIBDIR) && $(LN) -sf libpython$(VERSION).so.$(SOVERSION) libpython$(VERSION).so); \
-+ else true; \
-+ fi
- if test -f libpython$(VERSION).so; then \
- $(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \
- else true; \
-@@ -640,11 +682,11 @@
- done; \
- done
- $(INSTALL_DATA) $(srcdir)/LICENSE $(LIBDEST)/LICENSE.txt
-- PYTHONPATH=$(LIBDEST) \
-- ./$(BUILDPYTHON) -tt $(LIBDEST)/compileall.py -x badsyntax \
-- $(LIBDEST)
-- PYTHONPATH=$(LIBDEST) \
-- ./$(BUILDPYTHON) -O $(LIBDEST)/compileall.py -x badsyntax $(LIBDEST)
-+## PYTHONPATH=$(LIBDEST) \
-+## ./$(BUILDPYTHON) -tt $(LIBDEST)/compileall.py -x badsyntax \
-+## $(LIBDEST)
-+## PYTHONPATH=$(LIBDEST) \
-+## ./$(BUILDPYTHON) -O $(LIBDEST)/compileall.py -x badsyntax $(LIBDEST)
-
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
-@@ -686,12 +728,12 @@
- else true; \
- fi; \
- done
-- @if test -d $(LDLIBRARY); then :; else \
-+ @if test -d $(LIBRARY); then :; else \
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
-- $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \
-- $(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \
-+ $(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
-+ $(RANLIB) $(LIBPL)/$(LIBRARY) ; \
- else \
-- echo Skip install of $(LDLIBRARY) - use make frameworkinstall; \
-+ echo Skip install of $(LIBRARY) - use make frameworkinstall; \
- fi; \
- fi
- $(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c
-@@ -733,7 +775,8 @@
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall:
-- ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
-+ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
-+ --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
- --install-platlib=$(DESTSHARED)
-
-@@ -810,6 +853,11 @@
- .c.o:
- $(CC) -c $(PY_CFLAGS) -o $@ $<
-
-+.SUFFIXES: .pic_o
-+
-+.c.pic_o:
-+ $(CC) -c $(PY_CFLAGS) $(CCSHARED) -o $@ $<
-+
- # Rerun configure with the same options as it was run last time,
- # provided the config.status script exists
- recheck:
-diff -Nur Python-2.2.2.orig/configure.in Python-2.2.2/configure.in
---- Python-2.2.2.orig/configure.in Thu Oct 10 17:26:46 2002
-+++ Python-2.2.2/configure.in Thu Oct 17 12:05:36 2002
-@@ -8,6 +8,10 @@
- AC_SUBST(VERSION)
- VERSION=2.2
-
-+# Set SOVERSION
-+AC_SUBST(SOVERSION)
-+SOVERSION=0.0
-+
- # Arguments passed to configure.
- AC_SUBST(CONFIG_ARGS)
- CONFIG_ARGS="$ac_configure_args"
-@@ -273,6 +277,7 @@
- # python might then depend on the C++ runtime
- # This is altered for AIX in order to build the export list before
- # linking.
-+# For Linux, we now build a shared library, too.
- AC_SUBST(LINKCC)
- AC_MSG_CHECKING(LINKCC)
- if test -z "$LINKCC"
-@@ -298,6 +303,9 @@
- LINKCC="LD_RUN_PATH=$libdir $(LINKCC)";;
- Monterey64*)
- LINKCC="$(LINKCC) -L/usr/lib/ia64l64";;
-+ Linux*|GNU*)
-+ LDLIBRARY='libpython$(VERSION).so.$(SOVERSION)'
-+ LINKCC="\$(CC)";;
- esac
- fi
- AC_MSG_RESULT($LINKCC)
-@@ -824,7 +832,7 @@
- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)'
- fi ;;
-- Linux*) LDSHARED='$(CC) -shared';;
-+ Linux*|GNU*) LDSHARED='$(CC) -shared';;
- dgux*) LDSHARED="ld -G";;
- BSD/OS*/4*) LDSHARED="gcc -shared";;
- OpenBSD*|FreeBSD*)
-@@ -861,7 +869,7 @@
- then CCSHARED="-fPIC";
- else CCSHARED="+z";
- fi;;
-- Linux*) CCSHARED="-fPIC";;
-+ Linux*|GNU*) CCSHARED="-fPIC";;
- BSD/OS*/4*) CCSHARED="-fpic";;
- FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
- OpenUNIX*|UnixWare*)
-@@ -893,7 +901,7 @@
- hp*|HP*)
- LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
- BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
-- Linux*) LINKFORSHARED="-Xlinker -export-dynamic";;
-+ Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
- # -u libsys_s pulls in all symbols in libsys
- Darwin/*)
- # -u __dummy makes the linker aware of the objc runtime
-@@ -1066,8 +1074,14 @@
- AC_MSG_RESULT($unistd_defines_pthreads)
-
- AC_DEFINE(_REENTRANT)
-+ AC_CHECK_HEADER(cthreads.h, [AC_DEFINE(WITH_THREAD)
-+ AC_DEFINE(C_THREADS)
-+ AC_DEFINE(HURD_C_THREADS)
-+ LIBS="$LIBS -lthreads"
-+ LIBOBJS="$LIBOBJS thread.o"],[
- AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
- AC_DEFINE(C_THREADS)
-+ AC_DEFINE(MACH_C_THREADS)
- LIBOBJS="$LIBOBJS thread.o"],[
- AC_MSG_CHECKING(for --with-pth)
- AC_ARG_WITH(pth,
-@@ -1121,7 +1135,7 @@
- LIBS="$LIBS -lcma"
- LIBOBJS="$LIBOBJS thread.o"],[
- USE_THREAD_MODULE="#"])
-- ])])])])])])])])])
-+ ])])])])])])])])])])
-
- if test "$posix_threads" = "yes"; then
- if test "$unistd_defines_pthreads" = "no"; then
projects / packages / python.git / commitdiff