abs/core-testing/python/python-2.6-internal-expat.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

--- setup.py    2008-04-22 12:12:24.613554757 +0300
+++ setup.py    2008-04-22 12:13:09.276544063 +0300
@@ -1035,18 +1035,15 @@
         #
         # More information on Expat can be found at www.libexpat.org.
         #
-        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
-        define_macros = [
-            ('HAVE_EXPAT_CONFIG_H', '1'),
-        ]
+        # Use system expat
+        expatinc = '/usr/include'
+        define_macros = []

         exts.append(Extension('pyexpat',
                               define_macros = define_macros,
                               include_dirs = [expatinc],
+                              libraries = ['expat'],
                               sources = ['pyexpat.c',
-                                         'expat/xmlparse.c',
-                                         'expat/xmlrole.c',
-                                         'expat/xmltok.c',
                                          ],
                               ))

@@ -1058,6 +1055,7 @@
             exts.append(Extension('_elementtree',
                                   define_macros = define_macros,
                                   include_dirs = [expatinc],
+                                  libraries = ['expat'],
                                   sources = ['_elementtree.c'],
                                   ))