| |
@@ -1,5 +1,7 @@
|
| |
- --- Python-2.7.4/Modules/Setup.dist.rhconfig 2013-04-06 16:02:34.000000000 +0200
|
| |
- +++ Python-2.7.4/Modules/Setup.dist 2013-04-08 10:05:16.369985654 +0200
|
| |
+ diff --git a/Modules/Setup.dist b/Modules/Setup.dist
|
| |
+ index bbc9222..2cf35a9 100644
|
| |
+ --- a/Modules/Setup.dist
|
| |
+ +++ b/Modules/Setup.dist
|
| |
@@ -153,7 +153,7 @@ GLHACK=-Dclear=__GLclear
|
| |
# modules are to be built as shared libraries (see above for more
|
| |
# detail; also note that *static* reverses this effect):
|
| |
@@ -9,7 +11,7 @@
|
| |
|
| |
# GNU readline. Unlike previous Python incarnations, GNU readline is
|
| |
# now incorporated in an optional module, configured in the Setup file
|
| |
- @@ -163,77 +163,77 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -163,33 +163,33 @@ GLHACK=-Dclear=__GLclear
|
| |
# it, depending on your system -- see the GNU readline instructions.
|
| |
# It's okay for this to be a shared library, too.
|
| |
|
| |
@@ -59,9 +61,7 @@
|
| |
|
| |
# Standard I/O baseline
|
| |
#_io -I$(srcdir)/Modules/_io _io/bufferedio.c _io/bytesio.c _io/fileio.c _io/iobase.c _io/_iomodule.c _io/stringio.c _io/textio.c
|
| |
-
|
| |
-
|
| |
- # Modules with some UNIX dependencies -- on by default:
|
| |
+ @@ -199,41 +199,41 @@ GLHACK=-Dclear=__GLclear
|
| |
# (If you have a really backward UNIX, select and socket may not be
|
| |
# supported...)
|
| |
|
| |
@@ -117,7 +117,7 @@
|
| |
|
| |
|
| |
# Multimedia modules -- off by default.
|
| |
- @@ -238,8 +238,8 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -241,8 +241,8 @@ GLHACK=-Dclear=__GLclear
|
| |
# #993173 says audioop works on 64-bit platforms, though.
|
| |
# These represent audio samples or images as strings:
|
| |
|
| |
@@ -128,7 +128,7 @@
|
| |
|
| |
|
| |
# Note that the _md5 and _sha modules are normally only built if the
|
| |
- @@ -249,14 +249,14 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -252,14 +252,14 @@ GLHACK=-Dclear=__GLclear
|
| |
# Message-Digest Algorithm, described in RFC 1321. The necessary files
|
| |
# md5.c and md5.h are included here.
|
| |
|
| |
@@ -147,7 +147,7 @@
|
| |
|
| |
|
| |
# SGI IRIX specific modules -- off by default.
|
| |
- @@ -303,12 +303,12 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -306,12 +306,12 @@ GLHACK=-Dclear=__GLclear
|
| |
# A Linux specific module -- off by default; this may also work on
|
| |
# some *BSDs.
|
| |
|
| |
@@ -162,7 +162,7 @@
|
| |
|
| |
|
| |
# The _tkinter module.
|
| |
- @@ -323,7 +323,7 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -326,7 +326,7 @@ GLHACK=-Dclear=__GLclear
|
| |
# every system.
|
| |
|
| |
# *** Always uncomment this (leave the leading underscore in!):
|
| |
@@ -171,7 +171,7 @@
|
| |
# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
|
| |
# -L/usr/local/lib \
|
| |
# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
|
| |
- @@ -333,7 +333,7 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -336,7 +336,7 @@ GLHACK=-Dclear=__GLclear
|
| |
# *** Or uncomment this for Solaris:
|
| |
# -I/usr/openwin/include \
|
| |
# *** Uncomment and edit for Tix extension only:
|
| |
@@ -180,7 +180,7 @@
|
| |
# *** Uncomment and edit for BLT extension only:
|
| |
# -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
|
| |
# *** Uncomment and edit for PIL (TkImaging) extension only:
|
| |
- @@ -342,7 +342,7 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -345,7 +345,7 @@ GLHACK=-Dclear=__GLclear
|
| |
# *** Uncomment and edit for TOGL extension only:
|
| |
# -DWITH_TOGL togl.c \
|
| |
# *** Uncomment and edit to reflect your Tcl/Tk versions:
|
| |
@@ -189,7 +189,7 @@
|
| |
# *** Uncomment and edit to reflect where your X11 libraries are:
|
| |
# -L/usr/X11R6/lib \
|
| |
# *** Or uncomment this for Solaris:
|
| |
- @@ -352,7 +352,7 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -355,7 +355,7 @@ GLHACK=-Dclear=__GLclear
|
| |
# *** Uncomment for AIX:
|
| |
# -lld \
|
| |
# *** Always uncomment this; X11 libraries to link with:
|
| |
@@ -198,7 +198,7 @@
|
| |
|
| |
# Lance Ellinghaus's syslog module
|
| |
#syslog syslogmodule.c # syslog daemon interface
|
| |
- @@ -374,7 +374,7 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -377,7 +377,7 @@ GLHACK=-Dclear=__GLclear
|
| |
# it is a highly experimental and dangerous device for calling
|
| |
# *arbitrary* C functions in *arbitrary* shared libraries:
|
| |
|
| |
@@ -207,7 +207,7 @@
|
| |
|
| |
|
| |
# Modules that provide persistent dictionary-like semantics. You will
|
| |
- @@ -397,7 +397,7 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -400,7 +400,7 @@ GLHACK=-Dclear=__GLclear
|
| |
#
|
| |
# First, look at Setup.config; configure may have set this for you.
|
| |
|
| |
@@ -216,7 +216,7 @@
|
| |
|
| |
|
| |
# Sleepycat Berkeley DB interface.
|
| |
- @@ -412,11 +412,9 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -415,11 +415,9 @@ GLHACK=-Dclear=__GLclear
|
| |
#
|
| |
# Edit the variables DB and DBLIBVERto point to the db top directory
|
| |
# and the subdirectory of PORT where you built it.
|
| |
@@ -231,7 +231,7 @@
|
| |
|
| |
# Historical Berkeley DB 1.85
|
| |
#
|
| |
- @@ -431,14 +430,14 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -434,14 +432,14 @@ GLHACK=-Dclear=__GLclear
|
| |
|
| |
|
| |
# Helper module for various ascii-encoders
|
| |
@@ -250,7 +250,7 @@
|
| |
|
| |
|
| |
# Lee Busby's SIGFPE modules.
|
| |
- @@ -461,7 +460,7 @@ GLHACK=-Dclear=__GLclear
|
| |
+ @@ -464,7 +462,7 @@ GLHACK=-Dclear=__GLclear
|
| |
# Andrew Kuchling's zlib module.
|
| |
# This require zlib 1.1.3 (or later).
|
| |
# See http://www.gzip.org/zlib/
|
| |
@@ -258,20 +258,21 @@
|
| |
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
|
| |
|
| |
# Interface to the Expat XML parser
|
| |
- #
|
| |
- @@ -480,14 +479,14 @@ GLHACK=-Dclear=__GLclear
|
| |
+ # More information on Expat can be found at www.libexpat.org.
|
| |
+ @@ -475,14 +473,14 @@ GLHACK=-Dclear=__GLclear
|
| |
# Hye-Shik Chang's CJKCodecs
|
| |
|
| |
# multibytecodec is required for all the other CJK codec modules
|
| |
-#_multibytecodec cjkcodecs/multibytecodec.c
|
| |
- +_multibytecodec cjkcodecs/multibytecodec.c
|
| |
-
|
| |
+ -
|
| |
-#_codecs_cn cjkcodecs/_codecs_cn.c
|
| |
-#_codecs_hk cjkcodecs/_codecs_hk.c
|
| |
-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
|
| |
-#_codecs_jp cjkcodecs/_codecs_jp.c
|
| |
-#_codecs_kr cjkcodecs/_codecs_kr.c
|
| |
-#_codecs_tw cjkcodecs/_codecs_tw.c
|
| |
+ +_multibytecodec cjkcodecs/multibytecodec.c
|
| |
+ +
|
| |
+_codecs_cn cjkcodecs/_codecs_cn.c
|
| |
+_codecs_hk cjkcodecs/_codecs_hk.c
|
| |
+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
|
| |