diff options
| author | Linus Yang <laokongzi@gmail.com> | 2014-09-04 15:01:26 +0800 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2014-10-20 19:19:24 +0200 |
| commit | d4c71b2c7ffa50454026c072284ecc4c1fa4b8fa (patch) | |
| tree | 9d5b0778136e836b0703181d1517001339c25298 /tools | |
| parent | 1824e76dab17e9632f46ac5f5d85a210f09d47b8 (diff) | |
[ios] - fix pil build with Xcode 6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/pythonmodule-pil/Imaging-1.1.7-bz2-link.patch | 13 | ||||
| -rw-r--r-- | tools/depends/target/pythonmodule-pil/Makefile | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tools/depends/target/pythonmodule-pil/Imaging-1.1.7-bz2-link.patch b/tools/depends/target/pythonmodule-pil/Imaging-1.1.7-bz2-link.patch new file mode 100644 index 0000000000..de284045a5 --- /dev/null +++ b/tools/depends/target/pythonmodule-pil/Imaging-1.1.7-bz2-link.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 5872f72..372eeaa 100644 +--- a/setup.py ++++ b/setup.py +@@ -293,7 +293,7 @@ class pil_build_ext(build_ext): + if feature.freetype_version == 20: + defs.append(("USE_FREETYPE_2_0", None)) + exts.append(Extension( +- "_imagingft", ["_imagingft.c"], libraries=["freetype"], ++ "_imagingft", ["_imagingft.c"], libraries=["freetype", "bz2", "z"], + define_macros=defs + )) + diff --git a/tools/depends/target/pythonmodule-pil/Makefile b/tools/depends/target/pythonmodule-pil/Makefile index 18fbc24087..c242df92fc 100644 --- a/tools/depends/target/pythonmodule-pil/Makefile +++ b/tools/depends/target/pythonmodule-pil/Makefile @@ -25,6 +25,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM); patch -p1 < ../Imaging-1.1.7-access.patch cd $(PLATFORM); patch -p0 < ../Imaging-1.1.7-zip-include.patch cd $(PLATFORM); patch -p0 < ../Imaging-1.1.7-remove-zlib-check.patch + cd $(PLATFORM); patch -p1 < ../Imaging-1.1.7-bz2-link.patch cd $(PLATFORM); sed -ie "s|"darwin"|"darwinNot"|g" "setup.py" $(LIBDYLIB): $(PLATFORM) |