patches/Python-09-shared-expat.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 10542 affc2803857a
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10542
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     1
--- Python-2.4.4/setup.py.expat	2007-08-08 10:48:40.489500000 -0400
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     2
+++ Python-2.4.4/setup.py	2007-08-08 10:53:36.397669000 -0400
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     3
@@ -823,6 +823,10 @@
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     4
         # is included in Modules/expat/.  Usage of a system
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     5
         # shared libexpat.so/expat.dll is not advised.
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     6
         #
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     7
+        # On Solaris, we use libexpat.so instead of statically linking it,
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     8
+        # otherwise it causes various crashes in apps that use both 
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     9
+        # Python and libexpat.  See 6544688 for details.
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    10
+        #
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    11
         # More information on Expat can be found at www.libexpat.org.
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    12
         #
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    13
         expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    14
@@ -833,10 +837,8 @@
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    15
                               define_macros = define_macros,
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    16
                               include_dirs = [expatinc],
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    17
                               sources = ['pyexpat.c',
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    18
-                                         'expat/xmlparse.c',
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    19
-                                         'expat/xmlrole.c',
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    20
-                                         'expat/xmltok.c',
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    21
-                                         ],
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    22
+                                         'expat/xmlparse.c'],
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    23
+                              libraries = ['expat']
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    24
                               ))
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    25
 
affc2803857a 2007-09-20 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    26
         # Hye-Shik Chang's CJKCodecs modules.