]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/blob - python/patches/00187-add-RPATH-to-pyexpat.patch
python: Update to 2.7.15
[people/stevee/ipfire-3.x.git] / python / patches / 00187-add-RPATH-to-pyexpat.patch
1 diff -r e8b8279ca118 setup.py
2 --- a/setup.py Sun Jul 21 21:57:52 2013 -0400
3 +++ b/setup.py Tue Aug 20 09:45:31 2013 +0200
4 @@ -1480,12 +1480,21 @@
5 'expat/xmltok_impl.h'
6 ]
7
8 + # Add an explicit RPATH to pyexpat.so pointing at the directory
9 + # containing the system expat (which has the extra XML_SetHashSalt
10 + # symbol), to avoid an ImportError with a link error if there's an
11 + # LD_LIBRARY_PATH containing a "vanilla" build of expat (without the
12 + # symbol) (rhbz#833271):
13 + EXPAT_RPATH = '/usr/lib64' if sys.maxint == 0x7fffffffffffffff else '/usr/lib'
14 +
15 +
16 exts.append(Extension('pyexpat',
17 define_macros = define_macros,
18 include_dirs = expat_inc,
19 libraries = expat_lib,
20 sources = ['pyexpat.c'] + expat_sources,
21 depends = expat_depends,
22 + extra_link_args = ['-Wl,-rpath,%s' % EXPAT_RPATH]
23 ))
24
25 # Fredrik Lundh's cElementTree module. Note that this also