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
|
--- astropy/utils/xml/setup_package.py.orig 2012-06-18 07:48:04.000000000 +0200
+++ astropy/utils/xml/setup_package.py 2012-06-19 12:43:29.685002916 +0200
@@ -4,7 +4,6 @@
def get_extensions(build_type='release'):
- EXPAT_DIR = 'cextern/expat/lib'
XML_DIR = 'astropy/utils/xml/src'
defines = [("HAVE_EXPAT_CONFIG_H", 1)]
@@ -21,18 +20,14 @@
# place of ours.
extra_link_args = [
'-Wl,--version-script={0}'.format(
- join(XML_DIR, 'iterparse.map'))
- ]
+ join(XML_DIR, 'iterparse.map')),
+ '-lexpat']
else:
extra_link_args = []
return [Extension(
"astropy.utils.xml._iterparser",
- [join(XML_DIR, "iterparse.c"),
- join(EXPAT_DIR, "xmlparse.c"),
- join(EXPAT_DIR, "xmlrole.c"),
- join(EXPAT_DIR, "xmltok.c"),
- join(EXPAT_DIR, "xmltok_impl.c")],
+ [join(XML_DIR, "iterparse.c")],
define_macros=defines,
- include_dirs=[XML_DIR, EXPAT_DIR],
+ include_dirs=[XML_DIR],
extra_link_args=extra_link_args)]
|