From 599ed18d58b966d2304bbd5c857eee0aa5c3fff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Mon, 18 Aug 2014 11:40:17 +0200
Subject: [PATCH 1/3] use cached dependencies for os x build

---
 setup-libraries.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/setup-libraries.sh b/setup-libraries.sh
index 359e14e3d..4dd4bc5db 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -63,6 +63,16 @@ cd ./osx/
 export CXX11=true
 
 if [ ${UNAME} = 'Darwin' ]; then
+
+if [ ! -z "${TRAVIS:-}" ]; then
+    if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz ./out/ ; then
+        rm -rf out/build-cpp11-libcpp-universal
+        tar -xzf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz
+    fi
+fi
+
+if [ -z "${TRAVIS:-}" -o ! -d out/build-cpp11-libcpp-universal ]; then
+
 source iPhoneOS.sh
     if [ ! -f out/build-cpp11-libcpp-armv7-iphoneos/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
     if [ ! -f out/build-cpp11-libcpp-armv7-iphoneos/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi
@@ -101,6 +111,13 @@ source MacOSX.sh
 
 ./scripts/make_universal.sh
 
+if [ ! -z "${TRAVIS:-}" ]; then
+    tar -zcf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz out/build-cpp11-libcpp-universal
+    aws s3 cp out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz s3://mapbox-gl-testing/dependencies/
+fi
+
+fi
+
 cd ../../
 ./configure \
 --pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/lib/pkgconfig \

From 46fc26837d688792a6fc58daf40dbca9fe7122fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Mon, 18 Aug 2014 11:46:51 +0200
Subject: [PATCH 2/3] fix downloading

---
 setup-libraries.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup-libraries.sh b/setup-libraries.sh
index 4dd4bc5db..609bc2409 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -71,7 +71,7 @@ if [ ! -z "${TRAVIS:-}" ]; then
     fi
 fi
 
-if [ -z "${TRAVIS:-}" -o ! -d out/build-cpp11-libcpp-universal ]; then
+if test -z "${TRAVIS:-}" || ! test -d out/build-cpp11-libcpp-universal; then
 
 source iPhoneOS.sh
     if [ ! -f out/build-cpp11-libcpp-armv7-iphoneos/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi

From 077bff33a6644eee1530b3d05c48822f7ba331fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Mon, 18 Aug 2014 11:51:15 +0200
Subject: [PATCH 3/3] install awscli on osx

---
 scripts/travis_before_install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index b6c5339b2..0827f9843 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -20,4 +20,5 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
     # install OS X dependencies
     #
     brew install autoconf automake libtool makedepend cmake pkg-config node git
+    sudo pip install awscli
 fi