From d531e3546b406addb90e9b87e2b7bf63371a4c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Tue, 26 Aug 2014 18:31:17 +0200
Subject: [PATCH] add hash of current directory since dependency builds are
 working dir-specific

---
 ios/mapbox-gl-cocoa |  2 +-
 setup-libraries.sh  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa
index cf1f1da00..e1c709a8d 160000
--- a/ios/mapbox-gl-cocoa
+++ b/ios/mapbox-gl-cocoa
@@ -1 +1 @@
-Subproject commit cf1f1da000a8a5f2867d70b3828bd5b692445d89
+Subproject commit e1c709a8de0b69aa6bfbcd9ea4faf981b6e799b2
diff --git a/setup-libraries.sh b/setup-libraries.sh
index 93107817f..0902d10de 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -51,7 +51,8 @@ set -u
 NODE=$(which node)
 NPM=$(which npm)
 
-MP_HASH="6d7e83e8042"
+MP_HASH="e741a075d28812e5d16b581e1540248fe19c52ce"
+DIR_HASH=$(echo `pwd` | git hash-object --stdin)
 if [ ! -d 'mapnik-packaging/' ]; then
   git clone https://github.com/mapnik/mapnik-packaging.git
 fi
@@ -66,9 +67,9 @@ 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
+    if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libcpp-universal_${MP_HASH}_${DIR_HASH}.tar.gz ./out/ ; then
         rm -rf out/build-cpp11-libcpp-universal
-        tar -xzf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz
+        tar -xzf out/build-cpp11-libcpp-universal_${MP_HASH}_${DIR_HASH}.tar.gz
     fi
 fi
 
@@ -113,8 +114,8 @@ source MacOSX.sh
 ./scripts/make_universal.sh
 
 if [[ $TRAVIS_PULL_REQUEST = "false" ]]; then
-    tar -zcf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz out/build-cpp11-libcpp-universal
-    aws s3 cp --acl public-read out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz s3://mapbox-gl-testing/dependencies/
+    tar -zcf out/build-cpp11-libcpp-universal_${MP_HASH}_${DIR_HASH}.tar.gz out/build-cpp11-libcpp-universal
+    aws s3 cp --acl public-read out/build-cpp11-libcpp-universal_${MP_HASH}_${DIR_HASH}.tar.gz s3://mapbox-gl-testing/dependencies/
 fi
 
 fi