summaryrefslogtreecommitdiffstats
path: root/extra/python/python-2.6-internal-expat.patch
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2009-02-12 09:24:35 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2009-02-12 09:24:35 +0000
commitdcd5b5be2cbd0a0505dc4b20fdeef4fef06ce8dc (patch)
tree45febbc2fbb58b2cd8fd00e7a53ad5ffca134563 /extra/python/python-2.6-internal-expat.patch
parentf9e132166ed98a4bf79f2defd8acbdf2315fe0e9 (diff)
parenta2e7b0043cd02246557d9743e4ca725ac0013b2e (diff)
downloadaports-dcd5b5be2cbd0a0505dc4b20fdeef4fef06ce8dc.tar.bz2
aports-dcd5b5be2cbd0a0505dc4b20fdeef4fef06ce8dc.tar.xz
Merge commit 'ncopa/master'
Diffstat (limited to 'extra/python/python-2.6-internal-expat.patch')
-rw-r--r--extra/python/python-2.6-internal-expat.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/extra/python/python-2.6-internal-expat.patch b/extra/python/python-2.6-internal-expat.patch
new file mode 100644
index 00000000..f345db8c
--- /dev/null
+++ b/extra/python/python-2.6-internal-expat.patch
@@ -0,0 +1,33 @@
+--- a/setup.py 2008-04-22 12:12:24.613554757 +0300
++++ b/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'],
+ ))
+