Add the rest of the code ;-)

This commit is contained in:
Alex Clark 2011-05-31 11:33:28 -04:00
parent fd1a64dccd
commit f4fe73c4fe
2 changed files with 14 additions and 1 deletions

View File

@ -2,6 +2,12 @@
Changelog Changelog
========= =========
1.7.1 (2011-05-31)
------------------
- More multi-arch support
[SteveM, regebro, barry, aclark]
1.7.0 (2011-05-27) 1.7.0 (2011-05-27)
------------------ ------------------

View File

@ -72,7 +72,7 @@ except ImportError:
NAME = 'Pillow' NAME = 'Pillow'
VERSION = '1.7.0' VERSION = '1.7.1'
PIL_VERSION = '1.1.7' PIL_VERSION = '1.1.7'
TCL_ROOT = None TCL_ROOT = None
JPEG_ROOT = None JPEG_ROOT = None
@ -442,6 +442,13 @@ class pil_build_ext(build_ext):
try: try:
if ret >> 8 == 0: if ret >> 8 == 0:
with open(tmpfile) as fp: with open(tmpfile) as fp:
multiarch_path_component = fp.readline().strip()
_add_directory(self.compiler.library_dirs,
'/usr/lib/' + multiarch_path_component)
_add_directory(self.compiler.include_dirs,
'/usr/include/' + multiarch_path_component)
finally:
os.unlink(tmpfile)
setup( setup(
name=NAME, name=NAME,