-diff -purN Python-2.6.2.orig/Makefile.pre.in Python-2.6.2/Makefile.pre.in
---- Python-2.6.2.orig/Makefile.pre.in 2009-09-28 10:58:20.000000000 +0000
-+++ Python-2.6.2/Makefile.pre.in 2009-09-28 10:59:26.000000000 +0000
+diff -purN Python-2.6.4.orig/Lib/cgi.py Python-2.6.4/Lib/cgi.py
+--- Python-2.6.4.orig/Lib/cgi.py 2010-01-27 09:00:02.000000000 +0100
++++ Python-2.6.4/Lib/cgi.py 2010-01-27 09:02:58.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/python
++#! /usr/bin/python
+
+ # NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
+ # intentionally NOT "/usr/bin/env python". On many systems
+diff -purN Python-2.6.4.orig/Makefile.pre.in Python-2.6.4/Makefile.pre.in
+--- Python-2.6.4.orig/Makefile.pre.in 2010-01-27 09:00:02.000000000 +0100
++++ Python-2.6.4/Makefile.pre.in 2010-01-27 09:00:24.000000000 +0100
@@ -175,6 +175,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
PYTHON= python$(EXE)
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
--root=/$(DESTDIR)
-diff -purN Python-2.6.2.orig/configure Python-2.6.2/configure
---- Python-2.6.2.orig/configure 2009-09-28 10:58:20.000000000 +0000
-+++ Python-2.6.2/configure 2009-09-28 10:59:26.000000000 +0000
-@@ -17054,151 +17054,17 @@ fi
+diff -purN Python-2.6.4.orig/Modules/Setup.dist Python-2.6.4/Modules/Setup.dist
+--- Python-2.6.4.orig/Modules/Setup.dist 2010-01-27 09:00:02.000000000 +0100
++++ Python-2.6.4/Modules/Setup.dist 2010-01-27 10:30:15.000000000 +0100
+@@ -152,7 +152,7 @@ GLHACK=-Dclear=__GLclear
+ # modules are to be built as shared libraries (see above for more
+ # detail; also note that *static* reverses this effect):
+
+-#*shared*
++*shared*
+
+ # GNU readline. Unlike previous Python incarnations, GNU readline is
+ # now incorporated in an optional module, configured in the Setup file
+@@ -162,16 +162,16 @@ GLHACK=-Dclear=__GLclear
+ # 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 -ltermcap
++readline readline.c -lreadline #-ltermcap
+
+
+ # 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()
++math mathmodule.c # -lm # math library functions, e.g. sin()
+ #_struct _struct.c # binary structure packing/unpacking
+-#time timemodule.c # -lm # time operations and variables
++time timemodule.c # -lm # time operations and variables
+ #operator operator.c # operator.add() and similar goodies
+ #_weakref _weakref.c # basic weak reference support
+ #_testcapi _testcapimodule.c # Python C API test module
+@@ -182,7 +182,7 @@ GLHACK=-Dclear=__GLclear
+ #_functools _functoolsmodule.c # Tools for working with functions and callable objects
+ #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator
+ #_pickle _pickle.c # pickle accelerator
+-#datetime datetimemodule.c # date/time type
++datetime datetimemodule.c # date/time type
+ #_bisect _bisectmodule.c # Bisection algorithms
+
+ #unicodedata unicodedata.c # static Unicode character database
+@@ -198,7 +198,7 @@ GLHACK=-Dclear=__GLclear
+ #fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
+ #spwd spwdmodule.c # spwd(3)
+ #grp grpmodule.c # grp(3)
+-#select selectmodule.c # select(2); not on ancient System V
++select selectmodule.c # select(2); not on ancient System V
+
+ # Memory-mapped files (also works on Win32).
+ #mmap mmapmodule.c
+@@ -207,7 +207,7 @@ GLHACK=-Dclear=__GLclear
+ #_csv _csv.c
+
+ # Socket module helper for socket(2)
+-#_socket socketmodule.c
++_socket socketmodule.c
+
+ # Socket module helper for SSL support; you must comment out the other
+ # socket line above, and possibly edit the SSL variable:
+@@ -302,7 +302,7 @@ GLHACK=-Dclear=__GLclear
+ # A Linux specific module -- off by default; this may also work on
+ # some *BSDs.
+
+-#linuxaudiodev linuxaudiodev.c
++linuxaudiodev linuxaudiodev.c
+
+
+ # George Neville-Neil's timing module:
+@@ -390,7 +390,7 @@ GLHACK=-Dclear=__GLclear
+ #
+ # First, look at Setup.config; configure may have set this for you.
+
+-#dbm dbmmodule.c # dbm(3) may require -lndbm or similar
++dbm dbmmodule.c -DHAVE_NDBM_H -lgdbm_compat -lgdbm # dbm(3) may require -lndbm or similar
+
+ # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
+ #
+diff -purN Python-2.6.4.orig/configure Python-2.6.4/configure
+--- Python-2.6.4.orig/configure 2010-01-27 09:00:02.000000000 +0100
++++ Python-2.6.4/configure 2010-01-27 09:00:24.000000000 +0100
+@@ -17190,151 +17190,17 @@ fi
fi
;;
esac
-@@ -24324,95 +24190,11 @@ else
+@@ -24749,95 +24615,11 @@ else
echo "${ECHO_T}no" >&6; }
fi
{ echo "$as_me:$LINENO: checking for socklen_t" >&5
-diff -purN Python-2.6.2.orig/setup.py Python-2.6.2/setup.py
---- Python-2.6.2.orig/setup.py 2009-09-28 10:58:20.000000000 +0000
-+++ Python-2.6.2/setup.py 2009-09-28 10:59:31.000000000 +0000
+diff -purN Python-2.6.4.orig/setup.py Python-2.6.4/setup.py
+--- Python-2.6.4.orig/setup.py 2010-01-27 09:00:02.000000000 +0100
++++ Python-2.6.4/setup.py 2010-01-27 09:00:24.000000000 +0100
@@ -273,15 +273,15 @@ class PyBuildExt(build_ext):
try:
imp.load_dynamic(ext.name, ext_filename)
development / attic / ports / opt-cross.git / blobdiff