From 540201ebd91c14921fdda9a370d713924c9c7f5e Mon Sep 17 00:00:00 2001
From: cekees <cekees@gmail.com>
Date: Sat, 9 May 2015 21:45:40 -0500
Subject: [PATCH 1/5] added options for <#> versions of png(zlib), freetype,
 and jpeg2K

---
 pkgs/pillow.yaml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/pillow.yaml b/pkgs/pillow.yaml
index 1cc90b543..fff105c0a 100644
--- a/pkgs/pillow.yaml
+++ b/pkgs/pillow.yaml
@@ -1,7 +1,21 @@
 extends: [setuptools_package]
 dependencies:
-  build: [png]
+  build: [zlib,png,freetype,openjpeg]
 
 sources:
 - key: tar.gz:q5qmcgfaefplufr7o6bbcdt67tn3cx4k
   url: https://pypi.python.org/packages/source/P/Pillow/Pillow-2.8.1.tar.gz
+
+build_stages:
+- name: install
+  mode: replace
+  handler: bash
+  bash: |
+       ${PYTHON} -c 'import setuptools; __file__="setup.py"; exec(open(__file__).read())' \
+       build_ext \
+       --enable-zlib --enable-freetype --enable-jpeg2000 \
+       --include-dirs="${ZLIB_DIR}/include:${PNG_DIR}/include:${FREETYPE_DIR}/include:${OPENJPEG_DIR}/include" \
+       --library-dirs="${ZLIB_DIR}/lib:${PNG_DIR}/lib:${FREETYPE_DIR}/lib:${OPENJPEG_DIR}/lib" \
+       install \
+       --prefix=. --root=${ARTIFACT} \
+       --single-version-externally-managed

From 82c7f22e4cd993808882239c111155234ba88d6a Mon Sep 17 00:00:00 2001
From: cekees <cekees@gmail.com>
Date: Wed, 13 May 2015 13:25:55 -0500
Subject: [PATCH 2/5] updated  approach to build_ext options

---
 base/setuptools_package.yaml |  1 +
 pkgs/pillow.yaml             | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/base/setuptools_package.yaml b/base/setuptools_package.yaml
index 98185993c..5f875fd97 100644
--- a/base/setuptools_package.yaml
+++ b/base/setuptools_package.yaml
@@ -22,6 +22,7 @@ build_stages:
   handler: bash
   bash: |
     ${PYTHON} -c 'import setuptools; __file__="setup.py"; exec(open(__file__).read())' \
+       ${SETUPTOOLS_PACKAGE_EXTRA_OPTIONS} \
        install \
        --prefix=. --root=${ARTIFACT} \
        --single-version-externally-managed
diff --git a/pkgs/pillow.yaml b/pkgs/pillow.yaml
index fff105c0a..d3a61ea1d 100644
--- a/pkgs/pillow.yaml
+++ b/pkgs/pillow.yaml
@@ -7,15 +7,12 @@ sources:
   url: https://pypi.python.org/packages/source/P/Pillow/Pillow-2.8.1.tar.gz
 
 build_stages:
-- name: install
+- name: build_ext_options
   mode: replace
+  before: install
   handler: bash
   bash: |
-       ${PYTHON} -c 'import setuptools; __file__="setup.py"; exec(open(__file__).read())' \
-       build_ext \
+       SETUPTOOLS_PACKAGE_EXTRA_OPTIONS=build_ext \
        --enable-zlib --enable-freetype --enable-jpeg2000 \
        --include-dirs="${ZLIB_DIR}/include:${PNG_DIR}/include:${FREETYPE_DIR}/include:${OPENJPEG_DIR}/include" \
-       --library-dirs="${ZLIB_DIR}/lib:${PNG_DIR}/lib:${FREETYPE_DIR}/lib:${OPENJPEG_DIR}/lib" \
-       install \
-       --prefix=. --root=${ARTIFACT} \
-       --single-version-externally-managed
+       --library-dirs="${ZLIB_DIR}/lib:${PNG_DIR}/lib:${FREETYPE_DIR}/lib:${OPENJPEG_DIR}/lib"

From d5cf3af73d54378c882eb5b3d0bf5ed98e2b8eb0 Mon Sep 17 00:00:00 2001
From: cekees <cekees@gmail.com>
Date: Wed, 13 May 2015 13:31:07 -0500
Subject: [PATCH 3/5] added export

---
 pkgs/pillow.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/pillow.yaml b/pkgs/pillow.yaml
index d3a61ea1d..6bcab1eb8 100644
--- a/pkgs/pillow.yaml
+++ b/pkgs/pillow.yaml
@@ -12,7 +12,7 @@ build_stages:
   before: install
   handler: bash
   bash: |
-       SETUPTOOLS_PACKAGE_EXTRA_OPTIONS=build_ext \
+       export SETUPTOOLS_PACKAGE_EXTRA_OPTIONS=build_ext \
        --enable-zlib --enable-freetype --enable-jpeg2000 \
        --include-dirs="${ZLIB_DIR}/include:${PNG_DIR}/include:${FREETYPE_DIR}/include:${OPENJPEG_DIR}/include" \
        --library-dirs="${ZLIB_DIR}/lib:${PNG_DIR}/lib:${FREETYPE_DIR}/lib:${OPENJPEG_DIR}/lib"

From 5377049a6b298d63103be00230c9cc69e9bc2a6d Mon Sep 17 00:00:00 2001
From: cekees <cekees@gmail.com>
Date: Wed, 13 May 2015 13:50:50 -0500
Subject: [PATCH 4/5] fixed options string

---
 pkgs/pillow.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/pillow.yaml b/pkgs/pillow.yaml
index 6bcab1eb8..8e07d62b2 100644
--- a/pkgs/pillow.yaml
+++ b/pkgs/pillow.yaml
@@ -12,7 +12,4 @@ build_stages:
   before: install
   handler: bash
   bash: |
-       export SETUPTOOLS_PACKAGE_EXTRA_OPTIONS=build_ext \
-       --enable-zlib --enable-freetype --enable-jpeg2000 \
-       --include-dirs="${ZLIB_DIR}/include:${PNG_DIR}/include:${FREETYPE_DIR}/include:${OPENJPEG_DIR}/include" \
-       --library-dirs="${ZLIB_DIR}/lib:${PNG_DIR}/lib:${FREETYPE_DIR}/lib:${OPENJPEG_DIR}/lib"
+       export SETUPTOOLS_PACKAGE_EXTRA_OPTIONS="build_ext --enable-zlib --enable-freetype --enable-jpeg2000 --include-dirs=${ZLIB_DIR}/include:${PNG_DIR}/include:${FREETYPE_DIR}/include:${OPENJPEG_DIR}/include --library-dirs=${ZLIB_DIR}/lib:${PNG_DIR}/lib:${FREETYPE_DIR}/lib:${OPENJPEG_DIR}/lib"

From 3550e37117e914e458e8fafa610b27a74210bdba Mon Sep 17 00:00:00 2001
From: cekees <cekees@gmail.com>
Date: Wed, 13 May 2015 13:52:17 -0500
Subject: [PATCH 5/5] fixed comma spacing

---
 pkgs/pillow.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/pillow.yaml b/pkgs/pillow.yaml
index 8e07d62b2..430151538 100644
--- a/pkgs/pillow.yaml
+++ b/pkgs/pillow.yaml
@@ -1,6 +1,6 @@
 extends: [setuptools_package]
 dependencies:
-  build: [zlib,png,freetype,openjpeg]
+  build: [zlib, png, freetype, openjpeg]
 
 sources:
 - key: tar.gz:q5qmcgfaefplufr7o6bbcdt67tn3cx4k