From 5e429f706ced8a6b2d842fb5eff4ba844d7b8da6 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 15:07:14 -0700
Subject: [PATCH 1/2] [build] debug: stop defaulting to static analyzer, use
 -O1, and add hardening flags

---
 common.gypi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/common.gypi b/common.gypi
index a3e4e5e2f..8e6919a10 100644
--- a/common.gypi
+++ b/common.gypi
@@ -17,13 +17,11 @@
         'cflags': [ '-g', '-O0' ],
         'defines': [ 'DEBUG' ],
         'xcode_settings': {
-          'GCC_OPTIMIZATION_LEVEL': '0',
+          'GCC_OPTIMIZATION_LEVEL': '1',
           'GCC_GENERATE_DEBUGGING_SYMBOLS': 'YES',
           'DEAD_CODE_STRIPPING': 'NO',
           'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO',
-          'RUN_CLANG_STATIC_ANALYZER':'YES',
-          'CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY': 'YES',
-          'CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER': 'YES'
+          'OTHER_CPLUSPLUSFLAGS': [ '-fno-omit-frame-pointer','-fwrapv', '-fstack-protector-all', '-fno-common']
         }
       },
       'Release': {

From 8413860a58ef2adcf4ceab27ee3107415b58cb62 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 15:34:05 -0700
Subject: [PATCH 2/2] add zlib to linux deps

---
 README.md          | 2 +-
 setup-libraries.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c94627b47..a8d3c31c9 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Target devices: iPhone 4 and above (4S, 5, 5c, 5s) and iPad 2 and above (3, 4, m
 Ensure you have git and other build essentials:
 
     sudo apt-get update
-    sudo apt-get install git cmake make pkg-config curl automake libtool xutils-dev
+    sudo apt-get install git build-essential zlib1g-dev automake libtool xutils-dev make cmake pkg-config nodejs-legacy
 
 Install a `-std=c++11` capable compiler
 
diff --git a/setup-libraries.sh b/setup-libraries.sh
index b92cd3f05..710562bf1 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -32,7 +32,7 @@ if [[ $MISSING_DEPS != "" ]]; then
         echo 'and then re-run ./setup-libraries.sh'
     elif [ ${UNAME} = 'Linux' ]; then
         echo "Missing build deps: ${MISSING_DEPS}"
-        echo 'Please run "sudo apt-get install automake libtool xutils-dev cmake pkg-config libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev nodejs-legacy"'
+        echo 'Please run "sudo apt-get install git build-essential zlib1g-dev automake libtool xutils-dev make cmake pkg-config nodejs-legacy libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev"'
         echo 'and then re-run ./setup-libraries.sh'
     fi
     exit 1