10542
|
1 |
--- Python-2.4.4/setup.py.expat 2007-08-08 10:48:40.489500000 -0400
|
|
2 |
+++ Python-2.4.4/setup.py 2007-08-08 10:53:36.397669000 -0400
|
|
3 |
@@ -823,6 +823,10 @@
|
|
4 |
# is included in Modules/expat/. Usage of a system
|
|
5 |
# shared libexpat.so/expat.dll is not advised.
|
|
6 |
#
|
|
7 |
+ # On Solaris, we use libexpat.so instead of statically linking it,
|
|
8 |
+ # otherwise it causes various crashes in apps that use both
|
|
9 |
+ # Python and libexpat. See 6544688 for details.
|
|
10 |
+ #
|
|
11 |
# More information on Expat can be found at www.libexpat.org.
|
|
12 |
#
|
|
13 |
expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
|
|
14 |
@@ -833,10 +837,8 @@
|
|
15 |
define_macros = define_macros,
|
|
16 |
include_dirs = [expatinc],
|
|
17 |
sources = ['pyexpat.c',
|
|
18 |
- 'expat/xmlparse.c',
|
|
19 |
- 'expat/xmlrole.c',
|
|
20 |
- 'expat/xmltok.c',
|
|
21 |
- ],
|
|
22 |
+ 'expat/xmlparse.c'],
|
|
23 |
+ libraries = ['expat']
|
|
24 |
))
|
|
25 |
|
|
26 |
# Hye-Shik Chang's CJKCodecs modules.
|