--- Python-2.4.4/setup.py.expat 2007-08-08 10:48:40.489500000 -0400
+++ Python-2.4.4/setup.py 2007-08-08 10:53:36.397669000 -0400
@@ -823,6 +823,10 @@
# is included in Modules/expat/. Usage of a system
# shared libexpat.so/expat.dll is not advised.
#
+ # On Solaris, we use libexpat.so instead of statically linking it,
+ # otherwise it causes various crashes in apps that use both
+ # Python and libexpat. See 6544688 for details.
+ #
# More information on Expat can be found at www.libexpat.org.
#
expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
@@ -833,10 +837,8 @@
define_macros = define_macros,
include_dirs = [expatinc],
sources = ['pyexpat.c',
- 'expat/xmlparse.c',
- 'expat/xmlrole.c',
- 'expat/xmltok.c',
- ],
+ 'expat/xmlparse.c'],
+ libraries = ['expat']
))
# Hye-Shik Chang's CJKCodecs modules.