From af15be61b85479e6afb59204afe2553454ee36c6 Mon Sep 17 00:00:00 2001
From: Luke Hodkinson <furious.luke@gmail.com>
Date: Mon, 21 Mar 2016 17:26:51 +1100
Subject: [PATCH 1/3] Don't stomp on pre-existing environment values, in
 particular the `PKG_CONFIG_PATH` variable.

---
 bin/compile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/compile b/bin/compile
index 89cd4c9..e60405b 100755
--- a/bin/compile
+++ b/bin/compile
@@ -112,11 +112,11 @@ export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH
 export PATH=$BUILD_DIR/.heroku/python/bin:$BUILD_DIR/.heroku/vendor/bin:$PATH
 export PYTHONUNBUFFERED=1
 export LANG=en_US.UTF-8
-export C_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include
-export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include
-export LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib
-export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib
-export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config
+export C_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include:$C_INCLUDE_PATH
+export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include:$CPLUS_INCLUDE_PATH
+export LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PATH
+export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH
+export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH
 
 # Switch to the repo's context.
 cd $BUILD_DIR

From be4f207aaccc72371085f74986ee45eb22253128 Mon Sep 17 00:00:00 2001
From: Luke Hodkinson <furious.luke@gmail.com>
Date: Mon, 21 Mar 2016 18:19:49 +1100
Subject: [PATCH 2/3] Print out all the information as we install.

---
 bin/steps/pip-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/steps/pip-install b/bin/steps/pip-install
index f210316..c73ceb1 100755
--- a/bin/steps/pip-install
+++ b/bin/steps/pip-install
@@ -5,7 +5,8 @@ puts-cmd "pip install -r requirements.txt"
 [ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
 
 set +e
-/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee $WARNINGS_LOG | cleanup | indent
+# /app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee $WARNINGS_LOG | cleanup | indent
+/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir | indent
 PIP_STATUS="${PIPESTATUS[0]}"
 set -e
 

From 4896396a518e7805adff549f7854331e3a0160e0 Mon Sep 17 00:00:00 2001
From: Luke Hodkinson <furious.luke@gmail.com>
Date: Mon, 21 Mar 2016 18:29:07 +1100
Subject: [PATCH 3/3] Removing debugging calls.

---
 bin/steps/pip-install | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/steps/pip-install b/bin/steps/pip-install
index c73ceb1..f210316 100755
--- a/bin/steps/pip-install
+++ b/bin/steps/pip-install
@@ -5,8 +5,7 @@ puts-cmd "pip install -r requirements.txt"
 [ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
 
 set +e
-# /app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee $WARNINGS_LOG | cleanup | indent
-/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir | indent
+/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee $WARNINGS_LOG | cleanup | indent
 PIP_STATUS="${PIPESTATUS[0]}"
 set -e