1ae4dd3f5e
build of pyexpat and elementtree modules
- add patch adapted from upstream (patch 7) to add support for building
against system expat; add --with-system-expat to "configure" invocation
- remove embedded copies of expat and zlib from source tree during "prep"
227 lines
8.3 KiB
Diff
227 lines
8.3 KiB
Diff
diff -up Python-3.1.1/Modules/Setup.dist.config Python-3.1.1/Modules/Setup.dist
|
|
--- Python-3.1.1/Modules/Setup.dist.config 2009-06-04 05:30:30.000000000 -0400
|
|
+++ Python-3.1.1/Modules/Setup.dist 2010-01-25 23:08:55.179858352 -0500
|
|
@@ -141,7 +141,7 @@ _symtable symtablemodule.c
|
|
# 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
|
|
@@ -151,71 +151,71 @@ _symtable symtablemodule.c
|
|
# 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()
|
|
-#_struct _struct.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
|
|
-#_testcapi _testcapimodule.c # Python C API test module
|
|
-#_random _randommodule.c # Random number generator
|
|
-#_collections _collectionsmodule.c # Container types
|
|
-#itertools itertoolsmodule.c # Functions creating iterators for efficient looping
|
|
-#atexit atexitmodule.c # Register functions to be run at interpreter-shutdown
|
|
+array arraymodule.c # array objects
|
|
+cmath cmathmodule.c # -lm # complex math library functions
|
|
+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
|
|
+operator operator.c # operator.add() and similar goodies
|
|
+_weakref _weakref.c # basic weak reference support
|
|
+_testcapi _testcapimodule.c # Python C API test module
|
|
+_random _randommodule.c # Random number generator
|
|
+_collections _collectionsmodule.c # Container types
|
|
+itertools itertoolsmodule.c # Functions creating iterators for efficient looping
|
|
+atexit atexitmodule.c # Register functions to be run at interpreter-shutdown
|
|
#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator
|
|
-#_pickle _pickle.c # pickle accelerator
|
|
+_pickle _pickle.c # pickle accelerator
|
|
#datetime datetimemodule.c # date/time type
|
|
-#_bisect _bisectmodule.c # Bisection algorithms
|
|
-#_heapq _heapqmodule.c # Heap queue algorithm
|
|
+_bisect _bisectmodule.c # Bisection algorithms
|
|
+_heapq _heapqmodule.c # Heap queue algorithm
|
|
|
|
-#unicodedata unicodedata.c # static Unicode character database
|
|
+unicodedata unicodedata.c # static Unicode character database
|
|
|
|
|
|
# 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)
|
|
-#spwd spwdmodule.c # spwd(3)
|
|
-#grp grpmodule.c # grp(3)
|
|
-#select selectmodule.c # select(2); not on ancient System V
|
|
+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
|
|
|
|
# Memory-mapped files (also works on Win32).
|
|
-#mmap mmapmodule.c
|
|
+mmap mmapmodule.c
|
|
|
|
# CSV file helper
|
|
-#_csv _csv.c
|
|
+_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:
|
|
#SSL=/usr/local/ssl
|
|
-#_ssl _ssl.c \
|
|
-# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
|
|
-# -L$(SSL)/lib -lssl -lcrypto
|
|
+_ssl _ssl.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
|
|
+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
|
|
+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.
|
|
@@ -223,7 +223,7 @@ _symtable symtablemodule.c
|
|
# #993173 says audioop works on 64-bit platforms, though.
|
|
# These represent audio samples or images as strings:
|
|
|
|
-#audioop audioop.c # Operations on audio samples
|
|
+audioop audioop.c # Operations on audio samples
|
|
|
|
|
|
# Note that the _md5 and _sha modules are normally only built if the
|
|
@@ -238,9 +238,9 @@ _symtable symtablemodule.c
|
|
|
|
# The _sha module implements the SHA checksum algorithms.
|
|
# (NIST's Secure Hash Algorithms.)
|
|
-#_sha shamodule.c
|
|
-#_sha256 sha256module.c
|
|
-#_sha512 sha512module.c
|
|
+_sha1 sha1module.c
|
|
+_sha256 sha256module.c
|
|
+_sha512 sha512module.c
|
|
|
|
|
|
# The _tkinter module.
|
|
@@ -255,7 +255,7 @@ _symtable symtablemodule.c
|
|
# every system.
|
|
|
|
# *** Always uncomment this (leave the leading underscore in!):
|
|
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
|
|
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
|
|
# *** 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:
|
|
@@ -265,7 +265,7 @@ _symtable symtablemodule.c
|
|
# *** Or uncomment this for Solaris:
|
|
# -I/usr/openwin/include \
|
|
# *** Uncomment and edit for Tix extension only:
|
|
-# -DWITH_TIX -ltix8.1.8.2 \
|
|
+ -DWITH_TIX -ltix \
|
|
# *** 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:
|
|
@@ -274,7 +274,7 @@ _symtable symtablemodule.c
|
|
# *** Uncomment and edit for TOGL extension only:
|
|
# -DWITH_TOGL togl.c \
|
|
# *** Uncomment and edit to reflect your Tcl/Tk versions:
|
|
-# -ltk8.2 -ltcl8.2 \
|
|
+ -ltk -ltcl \
|
|
# *** Uncomment and edit to reflect where your X11 libraries are:
|
|
# -L/usr/X11R6/lib \
|
|
# *** Or uncomment this for Solaris:
|
|
@@ -284,10 +284,10 @@ _symtable symtablemodule.c
|
|
# *** Uncomment for AIX:
|
|
# -lld \
|
|
# *** Always uncomment this; X11 libraries to link with:
|
|
-# -lX11
|
|
+ -lX11
|
|
|
|
# Lance Ellinghaus's syslog module
|
|
-#syslog syslogmodule.c # syslog daemon interface
|
|
+syslog syslogmodule.c # syslog daemon interface
|
|
|
|
|
|
# Curses support, requring the System V version of curses, often
|
|
@@ -321,14 +321,14 @@ _symtable symtablemodule.c
|
|
#
|
|
# First, look at Setup.config; configure may have set this for you.
|
|
|
|
-#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
|
|
+_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
|
|
|
|
|
|
# Helper module for various ascii-encoders
|
|
-#binascii binascii.c
|
|
+binascii binascii.c
|
|
|
|
# Fred Drake's interface to the Python parser
|
|
-#parser parsermodule.c
|
|
+parser parsermodule.c
|
|
|
|
|
|
# Lee Busby's SIGFPE modules.
|
|
@@ -351,7 +351,7 @@ _symtable symtablemodule.c
|
|
# Andrew Kuchling's zlib module.
|
|
# This require zlib 1.1.3 (or later).
|
|
# See http://www.gzip.org/zlib/
|
|
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
|
|
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
|
|
|
|
# Interface to the Expat XML parser
|
|
#
|
|
@@ -369,14 +369,14 @@ _symtable symtablemodule.c
|
|
# 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
|
|
+_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
|
|
|
|
# Example -- included for reference only:
|
|
# xx xxmodule.c
|