From d6175adb1ac1a186f374dd63f8048f1e2589647a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 21 Jan 2015 14:28:12 -0800
Subject: [PATCH 01/21] Update README.md

---
 plugins/input/templates/helloworld/README.md | 25 +++++---------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/plugins/input/templates/helloworld/README.md b/plugins/input/templates/helloworld/README.md
index 5a5b50975..b940a8084 100644
--- a/plugins/input/templates/helloworld/README.md
+++ b/plugins/input/templates/helloworld/README.md
@@ -14,6 +14,7 @@ When added to a map it provides a single point geometry representing
 the center of any query. This means that it should place a point in
 the middle of any map tile and display a "hello world!" label if used like:
 
+```xml
 <?xml version="1.0" encoding="utf-8"?>
 <Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs" background-color="white">
     <Style name="style">
@@ -29,25 +30,11 @@ the middle of any map tile and display a "hello world!" label if used like:
         </Datasource>
     </Layer>
 </Map>
-
+```
 
 Or used in python like:
 
-from mapnik import *
-m = Map(600,400)
-m.background = Color('white')
-s = Style()
-r = Rule()
-r.symbols.append(PointSymbolizer())
-t = TextSymbolizer(Expression("[key]"),"DejaVu Sans Book",10,Color('black'))
-t.displacement = (15,15)
-r.symbols.append(t)
-s.rules.append(r)
-m.append_style('style',s)
-ds = Datasource(type="hello")
-l = Layer('test')
-l.styles.append('style')
-l.datasource = ds
-m.layers.append(l)
-m.zoom_all()
-render_to_file(m,'test.png')
+```
+import mapnik
+ds = mapnik.Datasource(type="hello")
+```

From 4a1f4a9b5ea30b79dfd7dfa9f683ef57c52f3278 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 22 Jan 2015 15:54:21 -0800
Subject: [PATCH 02/21] Use geometry_table_ rather than table_ for SRID lookup 
 - this will result in a faster query in the case that    the user provides an
 explicit geometry_table option

---
 plugins/input/postgis/postgis_datasource.cpp | 45 +++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 908b939b8..0efc8be49 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -195,6 +195,8 @@ postgis_datasource::postgis_datasource(parameters const& params)
                     if (rs->next())
                     {
                         geometryColumn_ = rs->getValue("f_geometry_column");
+                        // only accept srid from geometry_tables if
+                        // user has not provided as option
                         if (srid_ == 0)
                         {
                             const char* srid_c = rs->getValue("srid");
@@ -211,37 +213,38 @@ postgis_datasource::postgis_datasource(parameters const& params)
                     }
                     rs->close();
                 }
-                catch (mapnik::datasource_exception const& ex) {
+                catch (mapnik::datasource_exception const& ex)
+                {
                     // let this pass on query error and use the fallback below
                     MAPNIK_LOG_WARN(postgis) << "postgis_datasource: metadata query failed: " << ex.what();
                 }
+            }
 
-                // If we still do not know the srid then we can try to fetch
-                // it from the 'table_' parameter, which should work even if it is
-                // a subselect as long as we know the geometry_field to query
-                if (! geometryColumn_.empty() && srid_ <= 0)
+            // If we still do not know the srid then we can try to fetch
+            // it from the 'geometry_table_' parameter, which should work even if it is
+            // a subselect as long as we know the geometry_field to query
+            if (! geometryColumn_.empty() && srid_ <= 0)
+            {
+                std::ostringstream s;
+
+                s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM "
+                  << populate_tokens(geometry_table_) << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;";
+
+                shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
+                if (rs->next())
                 {
-                    s.str("");
-
-                    s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM "
-                      << populate_tokens(table_) << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;";
-
-                    shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
-                    if (rs->next())
+                    const char* srid_c = rs->getValue("srid");
+                    if (srid_c != nullptr)
                     {
-                        const char* srid_c = rs->getValue("srid");
-                        if (srid_c != nullptr)
+                        int result = 0;
+                        const char * end = srid_c + std::strlen(srid_c);
+                        if (mapnik::util::string2int(srid_c, end, result))
                         {
-                            int result = 0;
-                            const char * end = srid_c + std::strlen(srid_c);
-                            if (mapnik::util::string2int(srid_c, end, result))
-                            {
-                                srid_ = result;
-                            }
+                            srid_ = result;
                         }
                     }
-                    rs->close();
                 }
+                rs->close();
             }
 
             // detect primary key

From fcdc826294ddc9deba90c055611ee1b92b4ccf45 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 22 Jan 2015 18:25:37 -0800
Subject: [PATCH 03/21] Add (currently failing) test for #2651

---
 tests/cpp_tests/params_test.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/cpp_tests/params_test.cpp b/tests/cpp_tests/params_test.cpp
index 081cc3b08..96497ed0d 100644
--- a/tests/cpp_tests/params_test.cpp
+++ b/tests/cpp_tests/params_test.cpp
@@ -6,6 +6,22 @@
 #include <vector>
 #include <algorithm>
 
+namespace detail {
+
+class string_holder {
+ public:
+    string_holder() :
+     member_("member") {}
+    std::string const& get_string() const
+    {
+        return member_;
+    }
+ private:
+    std::string member_;
+};
+
+}
+
 int main(int argc, char** argv)
 {
     std::vector<std::string> args;
@@ -79,6 +95,20 @@ int main(int argc, char** argv)
         params["null"] = mapnik::value_null();
         // https://github.com/mapnik/mapnik/issues/2471
         //BOOST_TEST( (params.get<mapnik::value_null>("null") && *params.get<mapnik::value_null>("null") == mapnik::value_null()) );
+
+        std::string rvalue("rvalue");
+        params["rvalue"] = rvalue;
+        BOOST_TEST(params.get<std::string>("rvalue") == std::string("rvalue"));
+        // Currently this fails because rvalue gets moved and nulled out
+        // Is this really the right behavior?
+        BOOST_TEST(rvalue == std::string("rvalue"));
+
+        // ensure that const member is not moved incorrectly when added to params
+        detail::string_holder holder;
+        std::string const& holder_member = holder.get_string();
+        params["member"] = holder_member;
+        BOOST_TEST(params.get<std::string>("member") == std::string("member"));
+        BOOST_TEST(holder_member == std::string("member"));
     }
     catch (std::exception const& ex)
     {

From ec111c8a274778e8b0055f311c840e75e12e0686 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 22 Jan 2015 18:44:56 -0800
Subject: [PATCH 04/21] add extra metadata to lyr desc + use for srid/keyfield
 in postgis - closes #2650

---
 bindings/python/mapnik_datasource.cpp        |   3 +
 include/mapnik/attribute_descriptor.hpp      |  12 +-
 include/mapnik/feature_layer_desc.hpp        |  18 ++-
 plugins/input/postgis/postgis_datasource.cpp |   8 +
 tests/python_tests/postgis_test.py           | 152 ++++++++++++++++++-
 5 files changed, 177 insertions(+), 16 deletions(-)

diff --git a/bindings/python/mapnik_datasource.cpp b/bindings/python/mapnik_datasource.cpp
index da52ed4ab..56347d822 100644
--- a/bindings/python/mapnik_datasource.cpp
+++ b/bindings/python/mapnik_datasource.cpp
@@ -107,6 +107,9 @@ boost::python::dict describe(std::shared_ptr<mapnik::datasource> const& ds)
     description["name"] = ld.get_name();
     description["geometry_type"] = ds->get_geometry_type();
     description["encoding"] = ld.get_encoding();
+    for (auto const& param : ld.get_extra_parameters()) {
+        description[param.first] = param.second;
+    }
     return description;
 }
 
diff --git a/include/mapnik/attribute_descriptor.hpp b/include/mapnik/attribute_descriptor.hpp
index 3a17392da..1656cbb15 100644
--- a/include/mapnik/attribute_descriptor.hpp
+++ b/include/mapnik/attribute_descriptor.hpp
@@ -46,16 +46,16 @@ public:
                          int precision=-1)
         : name_(name),
           type_(type),
-          primary_key_(primary_key),
           size_(size),
-          precision_(precision) {}
+          precision_(precision),
+          primary_key_(primary_key) {}
 
     attribute_descriptor(attribute_descriptor const& other)
         : name_(other.name_),
           type_(other.type_),
-          primary_key_(other.primary_key_),
           size_(other.size_),
-          precision_(other.precision_) {}
+          precision_(other.precision_),
+          primary_key_(other.primary_key_) {}
 
     attribute_descriptor& operator=(attribute_descriptor const& other)
     {
@@ -67,9 +67,9 @@ public:
         {
             name_=other.name_;
             type_=other.type_;
-            primary_key_=other.primary_key_;
             size_=other.size_;
             precision_=other.precision_;
+            primary_key_=other.primary_key_;
             return *this;
         }
     }
@@ -102,9 +102,9 @@ public:
 private:
     std::string name_;
     unsigned int type_;
-    bool primary_key_;
     int size_;
     int precision_;
+    bool primary_key_;
 };
 
 }
diff --git a/include/mapnik/feature_layer_desc.hpp b/include/mapnik/feature_layer_desc.hpp
index e42396b89..7dd1293f7 100644
--- a/include/mapnik/feature_layer_desc.hpp
+++ b/include/mapnik/feature_layer_desc.hpp
@@ -25,6 +25,7 @@
 
 // mapnik
 #include <mapnik/attribute_descriptor.hpp>
+#include <mapnik/params.hpp>
 
 // stl
 #include <iosfwd>
@@ -39,12 +40,14 @@ public:
     layer_descriptor(std::string const& name, std::string const& encoding)
         : name_(name),
           encoding_(encoding),
-          desc_ar_() {}
+          desc_ar_(),
+          extra_params_() {}
 
     layer_descriptor(layer_descriptor const& other)
         : name_(other.name_),
           encoding_(other.encoding_),
-          desc_ar_(other.desc_ar_) {}
+          desc_ar_(other.desc_ar_),
+          extra_params_(other.extra_params_) {}
 
     void set_name(std::string const& name)
     {
@@ -81,10 +84,21 @@ public:
         return desc_ar_;
     }
 
+    parameters const& get_extra_parameters() const
+    {
+        return extra_params_;
+    }
+
+    parameters& get_extra_parameters()
+    {
+        return extra_params_;
+    }
+
 private:
     std::string name_;
     std::string encoding_;
     std::vector<attribute_descriptor> desc_ar_;
+    parameters extra_params_;
 };
 
 }
diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 0efc8be49..609a619dd 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -445,6 +445,14 @@ postgis_datasource::postgis_datasource(parameters const& params)
         // Close explicitly the connection so we can 'fork()' without sharing open connections
         conn->close();
 
+        // Finally, add unique metadata to layer descriptor
+        mapnik::parameters & extra_params = desc_.get_extra_parameters();
+        // explicitly make copies of values due to https://github.com/mapnik/mapnik/issues/2651
+        extra_params["srid"] = int(srid_);
+        if (!key_field_.empty())
+        {
+            extra_params["key_field"] = std::string(key_field_);
+        }
     }
 }
 
diff --git a/tests/python_tests/postgis_test.py b/tests/python_tests/postgis_test.py
index 13f46a09e..c299e407f 100644
--- a/tests/python_tests/postgis_test.py
+++ b/tests/python_tests/postgis_test.py
@@ -245,7 +245,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(feature['subregion'],29)
         eq_(feature['lon'],-61.783)
         eq_(feature['lat'],17.078)
-        eq_(ds.describe()['geometry_type'],mapnik.DataGeometryType.Polygon)
+        meta = ds.describe()
+        eq_(meta['srid'],3857)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['encoding'],u'UTF8')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Polygon)
 
     def test_subquery():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='(select * from world_merc) as w')
@@ -263,7 +267,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(feature['subregion'],29)
         eq_(feature['lon'],-61.783)
         eq_(feature['lat'],17.078)
-        eq_(ds.describe()['geometry_type'],mapnik.DataGeometryType.Polygon)
+        meta = ds.describe()
+        eq_(meta['srid'],3857)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['encoding'],u'UTF8')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Polygon)
 
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='(select gid,geom,fips as _fips from world_merc) as w')
         fs = ds.featureset()
@@ -271,7 +279,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(feature['gid'],1)
         eq_(feature['_fips'],u'AC')
         eq_(len(feature),2)
-        eq_(ds.describe()['geometry_type'],mapnik.DataGeometryType.Polygon)
+        meta = ds.describe()
+        eq_(meta['srid'],3857)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['encoding'],u'UTF8')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Polygon)
 
     def test_empty_db():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='empty')
@@ -282,12 +294,34 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         except StopIteration:
             pass
         eq_(feature,None)
-        eq_(ds.describe()['geometry_type'],None)
+        meta = ds.describe()
+        eq_(meta['srid'],-1)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['encoding'],u'UTF8')
+        eq_(meta['geometry_type'],None)
+
+    def test_manual_srid():
+        ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,srid=99, table='empty')
+        fs = ds.featureset()
+        feature = None
+        try:
+            feature = fs.next()
+        except StopIteration:
+            pass
+        eq_(feature,None)
+        meta = ds.describe()
+        eq_(meta['srid'],99)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['encoding'],u'UTF8')
+        eq_(meta['geometry_type'],None)
 
     def test_geometry_detection():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='test',
                             geometry_field='geom')
-        eq_(ds.describe()['geometry_type'],mapnik.DataGeometryType.Collection)
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Collection)
 
         # will fail with postgis 2.0 because it automatically adds a geometry_columns entry
         #ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='test',
@@ -327,6 +361,10 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(fs.next().id(),-1000)
         eq_(fs.next().id(),2147483647)
         eq_(fs.next().id(),-2147483648)
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),u'manual_id')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
 
     def test_auto_detection_will_fail_since_no_primary_key():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='test3',
@@ -353,6 +391,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(fs.next().id(),5)
         eq_(fs.next().id(),6)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     @raises(RuntimeError)
     def test_auto_detection_will_fail_and_should_throw():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='test3',
@@ -380,6 +423,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(fs.next().id(),2147483647)
         eq_(fs.next().id(),-2147483648)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),u'manual_id')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_disabled_auto_detection_and_subquery():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='''(select geom, 'a'::varchar as name from test2) as t''',
                             geometry_field='geom',
@@ -404,6 +452,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(feat.id(),6)
         eq_(feat['name'],'a')
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_auto_detection_and_subquery_including_key():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='''(select geom, manual_id from test2) as t''',
                             geometry_field='geom',
@@ -424,6 +477,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(fs.next().id(),2147483647)
         eq_(fs.next().id(),-2147483648)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),u'manual_id')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     @raises(RuntimeError)
     def test_auto_detection_of_invalid_numeric_primary_key():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='''(select geom, manual_id::numeric from test2) as t''',
@@ -463,6 +521,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(fs.next().id(),2147483647)
         eq_(fs.next().id(),-2147483648)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),u'manual_id')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_numeric_type_feature_id_field():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='test5',
                             geometry_field='geom',
@@ -475,6 +538,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(fs.next().id(),1)
         eq_(fs.next().id(),2)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_querying_table_with_mixed_case():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='"tableWithMixedCase"',
                             geometry_field='geom',
@@ -483,6 +551,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         for id in range(1,5):
             eq_(fs.next().id(),id)
 
+        meta = ds.describe()
+        eq_(meta['srid'],-1)
+        eq_(meta.get('key_field'),u'gid')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_querying_subquery_with_mixed_case():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='(SeLeCt * FrOm "tableWithMixedCase") as MixedCaseQuery',
                             geometry_field='geom',
@@ -491,6 +564,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         for id in range(1,5):
             eq_(fs.next().id(),id)
 
+        meta = ds.describe()
+        eq_(meta['srid'],-1)
+        eq_(meta.get('key_field'),u'gid')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_bbox_token_in_subquery1():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='''
            (SeLeCt * FrOm "tableWithMixedCase" where geom && !bbox! ) as MixedCaseQuery''',
@@ -500,6 +578,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         for id in range(1,5):
             eq_(fs.next().id(),id)
 
+        meta = ds.describe()
+        eq_(meta['srid'],-1)
+        eq_(meta.get('key_field'),u'gid')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_bbox_token_in_subquery2():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='''
            (SeLeCt * FrOm "tableWithMixedCase" where ST_Intersects(geom,!bbox!) ) as MixedCaseQuery''',
@@ -509,12 +592,22 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         for id in range(1,5):
             eq_(fs.next().id(),id)
 
+        meta = ds.describe()
+        eq_(meta['srid'],-1)
+        eq_(meta.get('key_field'),u'gid')
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_empty_geom():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='test7',
                             geometry_field='geom')
         fs = ds.featureset()
         eq_(fs.next()['gid'],1)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Collection)
+
     def create_ds():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,
                             table='test',
@@ -523,6 +616,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         fs = ds.all_features()
         eq_(len(fs),8)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Collection)
+
     def test_threaded_create(NUM_THREADS=100):
         # run one to start before thread loop
         # to ensure that a throw stops the test
@@ -568,6 +666,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(feat['gid'],2)
         eq_(feat['int_field'],922337203685477580)
 
+        meta = ds.describe()
+        eq_(meta['srid'],-1)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     def test_persist_connection_off():
         # NOTE: max_size should be equal or greater than
         #       the pool size. There's currently no API to
@@ -576,19 +679,29 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         #       http://github.com/mapnik/mapnik/issues/863
         max_size = 20
         for i in range(0, max_size+1):
-          ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,
+            ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,
                               max_size=1, # unused
                               persist_connection=False,
                               table='(select ST_MakePoint(0,0) as g, pg_backend_pid() as p, 1 as v) as w',
                               geometry_field='g')
-          fs = ds.featureset()
-          eq_(fs.next()['v'], 1)
+            fs = ds.featureset()
+            eq_(fs.next()['v'], 1)
+
+            meta = ds.describe()
+            eq_(meta['srid'],-1)
+            eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
 
     def test_null_comparision():
         ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME,table='test9',
                             geometry_field='geom')
         fs = ds.featureset()
         feat = fs.next()
+
+        meta = ds.describe()
+        eq_(meta['srid'],-1)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
         eq_(feat['gid'],1)
         eq_(feat['name'],'name')
         eq_(mapnik.Expression("[name] = 'name'").evaluate(feat),True)
@@ -636,6 +749,12 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
                             geometry_field='geom')
         fs = ds.featureset()
         feat = fs.next()
+
+        meta = ds.describe()
+        eq_(meta['srid'],-1)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
         eq_(feat['gid'],1)
         eq_(feat['bool_field'],True)
         eq_(mapnik.Expression("[bool_field] = 'name'").evaluate(feat),False)
@@ -696,6 +815,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(feat.id(),1L)
         eq_(feat['osm_id'],None)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),None)
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
     @raises(StopIteration)
     def test_null_key_field():
         opts = {'type':'postgis',
@@ -798,6 +922,13 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         eq_(ds.fields(),['gid', 'dim', 'name'])
         eq_(ds.field_types(),['int', 'int', 'str'])
         fs = ds.featureset()
+
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),None)
+        # Note: this is incorrect because we only check first couple geoms
+        eq_(meta['geometry_type'],mapnik.DataGeometryType.Point)
+
         # Point (2d)
         feat = fs.next()
         eq_(feat.id(),1)
@@ -1024,6 +1155,11 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
         for id in range(1,5):
             eq_(fs.next().id(),id)
 
+        meta = ds.describe()
+        eq_(meta['srid'],4326)
+        eq_(meta.get('key_field'),"gid")
+        eq_(meta['geometry_type'],None)
+
 
     atexit.register(postgis_takedown)
 

From 6ab91b23008c2f978bb666cee2dc6bedfbd90430 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 09:12:11 -0800
Subject: [PATCH 05/21] allow manually passing lib/include paths for libxml2
 and freetype

---
 SConstruct | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/SConstruct b/SConstruct
index 03f8ee76a..68583d292 100644
--- a/SConstruct
+++ b/SConstruct
@@ -88,10 +88,11 @@ pretty_dep_names = {
     'm':'Basic math library, part of C++ stlib',
     'pkg-config':'pkg-config tool | more info: http://pkg-config.freedesktop.org',
     'pg_config':'pg_config program | try setting PG_CONFIG SCons option',
-    'xml2-config':'xml2-config program | try setting XML2_CONFIG SCons option',
-    'libxml2':'libxml2 library | try setting XML2_CONFIG SCons option to point to location of xml2-config program',
+    'xml2-config':'xml2-config program | try setting XML2_CONFIG SCons option or avoid the need for xml2-config command by configuring with XML2_LIBS & XML2_INCLUDES',
+    'libxml2':'libxml2 library | try setting XML2_CONFIG SCons option to point to location of xml2-config program or configure with XML2_LIBS & XML2_INCLUDES',
     'gdal-config':'gdal-config program | try setting GDAL_CONFIG SCons option',
-    'freetype-config':'freetype-config program | try setting FREETYPE_CONFIG SCons option',
+    'freetype-config':'freetype-config program | try setting FREETYPE_CONFIG SCons option or configure with FREETYPE_LIBS & FREETYPE_INCLUDES',
+    'freetype':'libfreetype library | try setting FREETYPE_CONFIG SCons option or configure with FREETYPE_LIBS & FREETYPE_INCLUDES',
     'osm':'more info: https://github.com/mapnik/mapnik/wiki/OsmPlugin',
     'boost_regex_icu':'libboost_regex built with optional ICU unicode support is needed for unicode regex support in mapnik.',
     'sqlite_rtree':'The SQLite plugin requires libsqlite3 built with RTREE support (-DSQLITE_ENABLE_RTREE=1)',
@@ -351,6 +352,10 @@ opts.AddVariables(
     BoolVariable('PROJ', 'Build Mapnik with proj4 support to enable transformations between many different projections', 'True'),
     PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept),
     PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
+    ('FREETYPE_INCLUDES', 'Search path for Freetype include files', ''),
+    ('FREETYPE_LIBS', 'Search path for Freetype library files', ''),
+    ('XML2_INCLUDES', 'Search path for libxml2 include files', ''),
+    ('XML2_LIBS', 'Search path for libxml2 library files', ''),
     ('PKG_CONFIG_PATH', 'Use this path to point pkg-config to .pc files instead of the PKG_CONFIG_PATH environment setting',''),
 
     # Variables affecting rendering back-ends
@@ -1193,7 +1198,21 @@ if not preconfigured:
         env.AppendUnique(CPPPATH = os.path.realpath(inc_path))
         env.AppendUnique(LIBPATH = os.path.realpath(lib_path))
 
-    if conf.parse_config('FREETYPE_CONFIG'):
+    REQUIRED_LIBSHEADERS = [
+        ['z', 'zlib.h', True,'C'],
+        [env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],
+        ['harfbuzz', 'harfbuzz/hb.h',True,'C++']
+    ]
+
+    if env.get('FREETYPE_LIBS') or env.get('FREETYPE_INCLUDES'):
+        REQUIRED_LIBSHEADERS.append(['freetype','ft2build.h',True,'C'])
+        if env.get('FREETYPE_INCLUDES'):
+            inc_path = env['FREETYPE_INCLUDES']
+            env.AppendUnique(CPPPATH = os.path.realpath(inc_path))
+        if env.get('FREETYPE_LIBS'):
+            lib_path = env['FREETYPE_LIBS']
+            env.AppendUnique(LIBPATH = os.path.realpath(lib_path))
+    elif conf.parse_config('FREETYPE_CONFIG'):
         # check if freetype links to bz2
         if env['RUNTIME_LINK'] == 'static':
             temp_env = env.Clone()
@@ -1208,17 +1227,19 @@ if not preconfigured:
 
     # libxml2 should be optional but is currently not
     # https://github.com/mapnik/mapnik/issues/913
-    if conf.parse_config('XML2_CONFIG',checks='--cflags'):
+    if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'):
+        REQUIRED_LIBSHEADERS.append(['libxml2','libxml/parser.h',True,'C'])
+        if env.get('XML2_INCLUDES'):
+            inc_path = env['XML2_INCLUDES']
+            env.AppendUnique(CPPPATH = os.path.realpath(inc_path))
+        if env.get('XML2_LIBS'):
+            lib_path = env['XML2_LIBS']
+            env.AppendUnique(LIBPATH = os.path.realpath(lib_path))
+    elif conf.parse_config('XML2_CONFIG',checks='--cflags'):
         env['HAS_LIBXML2'] = True
     else:
         env['MISSING_DEPS'].append('libxml2')
 
-    REQUIRED_LIBSHEADERS = [
-        ['z', 'zlib.h', True,'C'],
-        [env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],
-        ['harfbuzz', 'harfbuzz/hb.h',True,'C++']
-    ]
-
     if conf.CheckHasDlfcn():
         env.Append(CPPDEFINES = '-DMAPNIK_HAS_DLCFN')
     else:

From 34b685db40c32d52a4830a5f5844da84783386ab Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 14:04:32 -0800
Subject: [PATCH 06/21] travis: try bootstraping deps with mason

---
 .travis.yml  |  27 ++--------
 bootstrap.sh | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+), 22 deletions(-)
 create mode 100755 bootstrap.sh

diff --git a/.travis.yml b/.travis.yml
index e0a579db1..d793c5488 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,6 @@ compiler:
  - clang
  - gcc
 
-env:
-  matrix:
-   - DEBUG=False PLUGIN_LINKING=static ENABLE_LOG=True  DEFAULT_LOG_SEVERITY=debug XMLPARSER="libxml2" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS=""
-   - DEBUG=False ENABLE_LOG=False DEFAULT_LOG_SEVERITY=none  XMLPARSER="ptree"   DEMO=False BENCHMARK=True CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS=""
-
 # travis + ubuntugis with gdal and postggis leads to many potential dead-end conflicts
 # the below is thanks to https://github.com/CartoDB/Windshaft/blob/d82fe08b32fc7907bbe907ab290f8a082215ae26/.travis.yml#L1
 before_install:
@@ -16,38 +11,26 @@ before_install:
   - sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
   - sudo apt-get -qq purge postgis* postgresql*
   - sudo apt-add-repository -y ppa:cartodb/postgresql-9.3
-  - sudo apt-add-repository -y ppa:cartodb/gis
-  # grab harfbuzz from ppa
-  - sudo apt-add-repository -y ppa:fontforge/fontforge
-  # we need at least g++-4.7 for c++11 features
-  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   # enable to test against latest boost rather that v1.48
   #- sudo add-apt-repository -y ppa:boost-latest/ppa
   - sudo rm -Rf /var/lib/postgresql /etc/postgresql
   - sudo apt-get update -qq
-  - sudo apt-get install -q libharfbuzz-dev postgresql-9.3-postgis-2.1 postgresql-contrib-9.3 gdal-bin libgdal-dev
+  - sudo apt-get install -q postgresql-9.3-postgis-2.1 postgresql-contrib-9.3
   - echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.3/main/pg_hba.conf
   - sudo service postgresql restart
 
 install:
  # enable to test against boost ppa
- #- sudo apt-get install -y boost1.55
- - sudo apt-get install -y libboost-python1.48-dev libboost-thread1.48-dev libboost-filesystem1.48-dev libboost-regex1.48-dev libboost-program-options1.48-dev
- - sudo apt-get install -y ttf-wqy-microhei make libstdc++6 libstdc++-4.8-dev valgrind python-nose libicu-dev libproj-dev libcairo-dev python-cairo-dev libcairo-dev python-cairo-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libsqlite3-dev
+ - sudo apt-get install -y ttf-wqy-microhei make valgrind python-nose 
 
 before_script:
  - psql -U postgres -c 'create database template_postgis'
  - psql -U postgres -c 'create extension postgis' -d template_postgis
- - if [[ "${CXX}" == 'g++' ]]; then export JOBS=2; sudo apt-get install gcc-4.8 g++-4.8; export CXX="$(which g++-4.8)"; export CC="$(which gcc-4.8)"; fi;
- - if [[ "${CXX}" == 'clang++' ]]; then export JOBS=4; export CXX="$(which clang++)"; export CC="$(which clang)"; fi;
 
 script:
- - rm -rf ./git
- - ./configure CXX="${CXX}" CC="${CC}" CUSTOM_CXXFLAGS="${CUSTOM_CXXFLAGS}" CUSTOM_LDFLAGS="${CUSTOM_LDFLAGS}" XML_PARSER="${XML_PARSER}" ENABLE_LOG="${ENABLE_LOG}" DEBUG="${DEBUG}" DEMO="${DEMO}" BENCHMARK="${BENCHMARK}" CPP_TESTS=True CAIRO=True FAST=True || cat config.log
- - if [[ "${DEBUG}" == True ]]; then export JOBS=$((JOBS/2)); fi;
- - make
+ - source bootstrap.sh
+ - JOBS=2 make
  - git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
  - make test
  - source localize.sh && make grind
- - if [[ ${BENCHMARK} != False ]]; then make bench; fi;
- - if [[ ${BENCHMARK} != False ]]; then for i in $(ls tests/visual_tests/styles/*xml); do echo $i;./benchmark/out/test_rendering --name "text rendering" --map $i --width 1024 --height 1024 --iterations 2 --threads 5;done;fi
+ - make bench
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 000000000..f970f6daf
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,145 @@
+#!/usr/bin/env bash
+
+#set -eu
+
+# NOTE: requires at least bash >= 4.0
+# brew install bash
+
+: '
+
+todo
+
+- switch to clang
+- gdal shared lib
+- boost_python_patch
+- shrink icu data
+- cairo
+'
+
+TOOLCHAIN="$(pwd)/toolchain"
+PPA="https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test/+files"
+
+function setup_linux_cpp11_toolchain() {
+  if [[ ! -d ${TOOLCHAIN} ]]; then
+      wget ${PPA}/libstdc%2B%2B6_4.8.1-2ubuntu1~12.04_amd64.deb
+      dpkg -x libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+      wget ${PPA}/gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+      dpkg -x gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+      wget ${PPA}/g%2B%2B-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+      dpkg -x g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+      wget ${PPA}/libisl10_0.12.2-2~12.04_amd64.deb
+      dpkg -x libisl10_0.12.2-2~12.04_amd64.deb ${TOOLCHAIN}
+      wget ${PPA}/libcloog-isl4_0.18.2-1~12.04_amd64.deb
+      dpkg -x libcloog-isl4_0.18.2-1~12.04_amd64.deb ${TOOLCHAIN}
+      wget ${PPA}/libstdc%2B%2B-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+      dpkg -x libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+      ${PPA}/gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
+      dpkg -x gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+      wget ${PPA}/libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+      dpkg -x libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+      wget ${PPA}/libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
+      dpkg -x libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+      wget ${PPA}/cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+      dpkg -x cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+  fi
+  export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
+  export LD_LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu"
+}
+
+declare -A DEPS
+DEPS["freetype"]="2.5.4"
+DEPS["harfbuzz"]="2cd5323"
+DEPS["jpeg"]="v8d"
+DEPS["libxml2"]="2.9.2"
+DEPS["libpng"]="1.6.13"
+DEPS["webp"]="0.4.2"
+DEPS["icu"]="54.1"
+DEPS["proj"]="4.8.0"
+DEPS["libtiff"]="dev"
+DEPS["boost"]="1.57.0"
+DEPS["boost_libsystem"]="1.57.0"
+DEPS["boost_libthread"]="1.57.0"
+DEPS["boost_libfilesystem"]="1.57.0"
+DEPS["boost_libprogram_options"]="1.57.0"
+DEPS["boost_libregex"]="1.57.0"
+DEPS["boost_libpython"]="1.57.0"
+DEPS["gdal"]="1.11.1"
+DEPS["libpq"]="9.4.0"
+
+if [[ -d ~/.mason ]]; then
+    export PATH=~/.mason:$PATH
+else
+    if [[ ! -d mason ]]; then
+        git clone --depth 1 https://github.com/mapbox/mason.git
+    fi
+    export MASON_DIR=$(PWD)
+    export PATH=$(pwd)/mason:$PATH
+fi
+
+for DEP in "${!DEPS[@]}"; do
+    mason install ${DEP} ${DEPS[$DEP]}
+done
+
+for DEP in "${!DEPS[@]}"; do
+    mason link ${DEP} ${DEPS[$DEP]}
+done
+
+MASON_LINKED=$(pwd)/mason_packages/.link
+
+export PROJ_LIB=${MASON_LINKED}/share/proj/
+export ICU_DATA=${MASON_LINKED}/share/icu/54.1/
+export GDAL_DATA=${MASON_LINKED}/share/gdal
+export PKG_CONFIG_PATH="${MASON_LINKED}/lib/pkgconfig"
+export C_INCLUDE_PATH="${MASON_LINKED}/include"
+export CPLUS_INCLUDE_PATH="${MASON_LINKED}/include"
+export LIBRARY_PATH="${MASON_LINKED}/lib"
+
+if [[ $(uname -s) == 'Linux' ]]; then
+  setup_linux_cpp11_toolchain
+  #sudo apt-get -y install zlib1g-dev python-dev make git python-dev python-nose
+fi
+
+CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1"
+MASON_LIBS="${MASON_LINKED}/lib"
+MASON_INCLUDES="${MASON_LINKED}/include"
+
+./configure \
+  CC=${TOOLCHAIN}/usr/bin/g++-4.8 \
+  CXX=${TOOLCHAIN}/usr/bin/g++-4.8 \
+  INPUT_PLUGINS=all \
+  SAMPLE_INPUT_PLUGINS=True \
+  SVG2PNG=True \
+  BENCHMARK=True \
+  SVG_RENDERER=True \
+  PATH_REMOVE=/usr:/usr/local \
+  RUNTIME_LINK=static \
+  CUSTOM_LDFLAGS="-L${MASON_LIBS}" \
+  CUSTOM_CXXFLAGS="${CXXFLAGS}" \
+  BOOST_INCLUDES="${MASON_INCLUDES}" \
+  BOOST_LIBS="${MASON_LIBS}" \
+  ICU_INCLUDES="${MASON_INCLUDES}" \
+  ICU_LIBS="${MASON_LIBS}" \
+  FREETYPE_INCLUDES="${MASON_INCLUDES}/freetype2" \
+  FREETYPE_LIBS="${MASON_LIBS}" \
+  XML2_INCLUDES="${MASON_INCLUDES}/libxml2" \
+  XML2_LIBS="${MASON_LIBS}" \
+  PNG_INCLUDES="${MASON_INCLUDES}/libpng16" \
+  PNG_LIBS="${MASON_LIBS}" \
+  JPEG_INCLUDES="${MASON_INCLUDES}" \
+  JPEG_LIBS="${MASON_LIBS}" \
+  WEBP_INCLUDES="${MASON_INCLUDES}" \
+  WEBP_LIBS="${MASON_LIBS}" \
+  TIFF_INCLUDES="${MASON_INCLUDES}" \
+  TIFF_LIBS="${MASON_LIBS}" \
+  PROJ_INCLUDES="${MASON_INCLUDES}" \
+  PROJ_LIBS="${MASON_LIBS}" \
+  CAIRO_INCLUDES="${MASON_INCLUDES}" \
+  CAIRO_LIBS="${MASON_LIBS}" \
+  SQLITE_INCLUDES="${MASON_INCLUDES}" \
+  SQLITE_LIBS="${MASON_LIBS}" \
+  HB_INCLUDES="${MASON_INCLUDES}" \
+  HB_LIBS="${MASON_LIBS}" \
+  SQLITE_INCLUDES="${MASON_INCLUDES}" \
+  SQLITE_LIBS="${MASON_LIBS}" \
+  SQLITE_INCLUDES="${MASON_INCLUDES}" \
+  SQLITE_LIBS="${MASON_LIBS}" \

From e53f4e863729fca963bb9d9cb579e72dc27d3988 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 14:21:54 -0800
Subject: [PATCH 07/21] sudoless

---
 .travis.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d793c5488..218199f5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: cpp
 
+sudo: false
+
 compiler:
  - clang
  - gcc
@@ -8,20 +10,20 @@ compiler:
 # the below is thanks to https://github.com/CartoDB/Windshaft/blob/d82fe08b32fc7907bbe907ab290f8a082215ae26/.travis.yml#L1
 before_install:
   - export PGUSER=postgres
-  - sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
-  - sudo apt-get -qq purge postgis* postgresql*
-  - sudo apt-add-repository -y ppa:cartodb/postgresql-9.3
+  #- sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
+  #- sudo apt-get -qq purge postgis* postgresql*
+  #- sudo apt-add-repository -y ppa:cartodb/postgresql-9.3
   # enable to test against latest boost rather that v1.48
   #- sudo add-apt-repository -y ppa:boost-latest/ppa
-  - sudo rm -Rf /var/lib/postgresql /etc/postgresql
-  - sudo apt-get update -qq
-  - sudo apt-get install -q postgresql-9.3-postgis-2.1 postgresql-contrib-9.3
-  - echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.3/main/pg_hba.conf
-  - sudo service postgresql restart
+  #- sudo rm -Rf /var/lib/postgresql /etc/postgresql
+  #- sudo apt-get update -qq
+  #- sudo apt-get install -q postgresql-9.3-postgis-2.1 postgresql-contrib-9.3
+  #- echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.3/main/pg_hba.conf
+  #- sudo service postgresql restart
 
 install:
  # enable to test against boost ppa
- - sudo apt-get install -y ttf-wqy-microhei make valgrind python-nose 
+ #- sudo apt-get install -y ttf-wqy-microhei make valgrind python-nose 
 
 before_script:
  - psql -U postgres -c 'create database template_postgis'
@@ -32,5 +34,5 @@ script:
  - JOBS=2 make
  - git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
  - make test
- - source localize.sh && make grind
+ #- source localize.sh && make grind
  - make bench

From 03192c5f2a6000e2a1e1116c1e9bff936a4dd12e Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 20:42:03 -0800
Subject: [PATCH 08/21] fix bash syntax

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

diff --git a/bootstrap.sh b/bootstrap.sh
index f970f6daf..a3d1cc756 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -72,7 +72,7 @@ else
     if [[ ! -d mason ]]; then
         git clone --depth 1 https://github.com/mapbox/mason.git
     fi
-    export MASON_DIR=$(PWD)
+    export MASON_DIR=$(pwd)
     export PATH=$(pwd)/mason:$PATH
 fi
 

From bdc49e2adb0fb86ab473dcd21c6f8a7540424aa1 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 21:44:32 -0800
Subject: [PATCH 09/21] fix mason setup

---
 bootstrap.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index a3d1cc756..7912d397e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -70,10 +70,10 @@ if [[ -d ~/.mason ]]; then
     export PATH=~/.mason:$PATH
 else
     if [[ ! -d mason ]]; then
-        git clone --depth 1 https://github.com/mapbox/mason.git
+        git clone --depth 1 https://github.com/mapbox/mason.git ./.mason
     fi
-    export MASON_DIR=$(pwd)
-    export PATH=$(pwd)/mason:$PATH
+    export MASON_DIR=$(pwd)/.mason
+    export PATH=$(pwd)/.mason:$PATH
 fi
 
 for DEP in "${!DEPS[@]}"; do

From be1690d5c79cc87401515aa972f2951be6dee153 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 22:57:45 -0800
Subject: [PATCH 10/21] try sudoless clang upgrade

---
 .travis.yml  |  2 +-
 bootstrap.sh | 64 +++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 218199f5c..a91287bf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ before_script:
 
 script:
  - source bootstrap.sh
- - JOBS=2 make
+ - JOBS=4 make
  - git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
  - make test
  #- source localize.sh && make grind
diff --git a/bootstrap.sh b/bootstrap.sh
index 7912d397e..0bd639760 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -18,6 +18,8 @@ todo
 
 TOOLCHAIN="$(pwd)/toolchain"
 PPA="https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test/+files"
+LLVM_DIST="http://llvm.org/apt/precise/pool/main/l/llvm-toolchain-3.5"
+SECURITY="http://security.ubuntu.com/ubuntu/pool/main/e/eglibc/"
 
 function setup_linux_cpp11_toolchain() {
   if [[ ! -d ${TOOLCHAIN} ]]; then
@@ -27,23 +29,75 @@ function setup_linux_cpp11_toolchain() {
       dpkg -x gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
       wget ${PPA}/g%2B%2B-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+
       wget ${PPA}/libisl10_0.12.2-2~12.04_amd64.deb
       dpkg -x libisl10_0.12.2-2~12.04_amd64.deb ${TOOLCHAIN}
       wget ${PPA}/libcloog-isl4_0.18.2-1~12.04_amd64.deb
       dpkg -x libcloog-isl4_0.18.2-1~12.04_amd64.deb ${TOOLCHAIN}
+
       wget ${PPA}/libstdc%2B%2B-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+
       ${PPA}/gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+
       wget ${PPA}/libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+
       wget ${PPA}/libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
+
       wget ${PPA}/cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
   fi
-  export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
-  export LD_LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu"
+  #export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/:${TOOLCHAIN}/usr/include/x86_64-linux-gnu:${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
+}
+
+function dpack() {
+  wget $1/$(echo $2 | sed 's/+/%2B/g')
+  dpkg -x $2 ${TOOLCHAIN}
+}
+
+function test_cpp11() {
+  echo '#include <iostream>' > test.cpp
+  echo ' ' >> test.cpp
+  echo 'int main() {' >> test.cpp
+  echo ' ' >> test.cpp
+  echo 'std::move("hello");' >> test.cpp
+  echo 'return 0;' >> test.cpp
+  echo '}' >> test.cpp
+  echo ' ' >> test.cpp
+  ./toolchain/usr/bin/clang++-3.5 -o test test.cpp -std=c++11
+}
+
+# http://llvm.org/apt/precise/dists/llvm-toolchain-precise-3.5/main/binary-amd64/Packages
+function setup_clang_toolchain() {
+    dpack ${LLVM_DIST} clang-3.5_3.5~svn217304-1~exp1_amd64.deb
+    dpack ${LLVM_DIST} libllvm3.5_3.5~svn217304-1~exp1_amd64.deb
+    dpack ${LLVM_DIST} libclang-common-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
+    #dpack ${LLVM_DIST} libclang1-3.5_3.5~svn215019-1~exp1_amd64.deb
+    #dpack ${LLVM_DIST} libclang-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
+    #dpack ${LLVM_DIST} llvm-3.5-runtime_3.5~svn215019-1~exp1_amd64.deb
+    dpack ${PPA} libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb
+    dpack ${PPA} libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} libisl10_0.12.2-2~12.04_amd64.deb
+    #dpack ${PPA} libcloog-isl4_0.18.2-1~12.04_amd64.deb
+    #dpack ${PPA} g++-4.8-multilib_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} gcc-4.8-locales_4.8.1-2ubuntu1~12.04_all.deb
+    #dpack ${SECURITY} libc6-dev_2.15-0ubuntu10.9_amd64.deb
+    #wget http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-libc-dev_3.2.0-75.110_amd64.deb
+    #dpkg -x linux-libc-dev_3.2.0-75.110_amd64.deb ${TOOLCHAIN}
+    #wget http://mirrors.kernel.org/ubuntu/pool/main/b/binutils/binutils-gold_2.22-6ubuntu1.1_amd64.deb
+    #dpkg -x binutils-gold_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
+    #wget http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils_2.22-6ubuntu1.1_amd64.deb
+    #dpkg -x binutils_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
 }
 
 declare -A DEPS
@@ -95,7 +149,11 @@ export CPLUS_INCLUDE_PATH="${MASON_LINKED}/include"
 export LIBRARY_PATH="${MASON_LINKED}/lib"
 
 if [[ $(uname -s) == 'Linux' ]]; then
-  setup_linux_cpp11_toolchain
+  #setup_linux_cpp11_toolchain
+  setup_clang_toolchain
+  export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
+  export LD_LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}"
+  export PATH=${TOOLCHAIN}/usr/bin:$PATH
   #sudo apt-get -y install zlib1g-dev python-dev make git python-dev python-nose
 fi
 

From 3ba834109aad121e5975f84ad297da186fe61119 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 23:01:08 -0800
Subject: [PATCH 11/21] debug configure fail

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a91287bf0..5f58db77e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@ before_script:
 
 script:
  - source bootstrap.sh
+ - cat config.log
  - JOBS=4 make
  - git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
  - make test

From 1a28cf763fd77416e372fad999d4325fc1b52bd0 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 23:05:41 -0800
Subject: [PATCH 12/21] use clang

---
 .travis.yml  | 4 ----
 bootstrap.sh | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f58db77e..87d3d444d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,6 @@ language: cpp
 
 sudo: false
 
-compiler:
- - clang
- - gcc
-
 # travis + ubuntugis with gdal and postggis leads to many potential dead-end conflicts
 # the below is thanks to https://github.com/CartoDB/Windshaft/blob/d82fe08b32fc7907bbe907ab290f8a082215ae26/.travis.yml#L1
 before_install:
diff --git a/bootstrap.sh b/bootstrap.sh
index 0bd639760..0e005e159 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -162,8 +162,8 @@ MASON_LIBS="${MASON_LINKED}/lib"
 MASON_INCLUDES="${MASON_LINKED}/include"
 
 ./configure \
-  CC=${TOOLCHAIN}/usr/bin/g++-4.8 \
-  CXX=${TOOLCHAIN}/usr/bin/g++-4.8 \
+  CC=${TOOLCHAIN}/usr/bin/clang-3.5 \
+  CXX=${TOOLCHAIN}/usr/bin/clang++-3.5 \
   INPUT_PLUGINS=all \
   SAMPLE_INPUT_PLUGINS=True \
   SVG2PNG=True \

From 6344b24193f19a0c3feb4652d0edd0a8ce2e3e1f Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 23:29:24 -0800
Subject: [PATCH 13/21] travis: disable benchmarks, install nose

---
 bootstrap.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 0e005e159..51b69a447 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -9,11 +9,11 @@
 
 todo
 
-- switch to clang
 - gdal shared lib
 - boost_python_patch
 - shrink icu data
 - cairo
+- benchmarks not linking to chrono
 '
 
 TOOLCHAIN="$(pwd)/toolchain"
@@ -29,28 +29,21 @@ function setup_linux_cpp11_toolchain() {
       dpkg -x gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
       wget ${PPA}/g%2B%2B-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-
       wget ${PPA}/libisl10_0.12.2-2~12.04_amd64.deb
       dpkg -x libisl10_0.12.2-2~12.04_amd64.deb ${TOOLCHAIN}
       wget ${PPA}/libcloog-isl4_0.18.2-1~12.04_amd64.deb
       dpkg -x libcloog-isl4_0.18.2-1~12.04_amd64.deb ${TOOLCHAIN}
-
       wget ${PPA}/libstdc%2B%2B-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-
       ${PPA}/gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-
       wget ${PPA}/libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-
       wget ${PPA}/libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-
       wget ${PPA}/cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
   fi
-  #export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/:${TOOLCHAIN}/usr/include/x86_64-linux-gnu:${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
 }
 
 function dpack() {
@@ -75,11 +68,11 @@ function setup_clang_toolchain() {
     dpack ${LLVM_DIST} clang-3.5_3.5~svn217304-1~exp1_amd64.deb
     dpack ${LLVM_DIST} libllvm3.5_3.5~svn217304-1~exp1_amd64.deb
     dpack ${LLVM_DIST} libclang-common-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
+    dpack ${PPA} libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb
+    dpack ${PPA} libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${LLVM_DIST} libclang1-3.5_3.5~svn215019-1~exp1_amd64.deb
     #dpack ${LLVM_DIST} libclang-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
     #dpack ${LLVM_DIST} llvm-3.5-runtime_3.5~svn215019-1~exp1_amd64.deb
-    dpack ${PPA} libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb
-    dpack ${PPA} libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
@@ -91,6 +84,7 @@ function setup_clang_toolchain() {
     #dpack ${PPA} g++-4.8-multilib_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} gcc-4.8-locales_4.8.1-2ubuntu1~12.04_all.deb
+    #export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/:${TOOLCHAIN}/usr/include/x86_64-linux-gnu:${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
     #dpack ${SECURITY} libc6-dev_2.15-0ubuntu10.9_amd64.deb
     #wget http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-libc-dev_3.2.0-75.110_amd64.deb
     #dpkg -x linux-libc-dev_3.2.0-75.110_amd64.deb ${TOOLCHAIN}
@@ -157,6 +151,10 @@ if [[ $(uname -s) == 'Linux' ]]; then
   #sudo apt-get -y install zlib1g-dev python-dev make git python-dev python-nose
 fi
 
+wget https://pypi.python.org/packages/source/n/nose/nose-1.3.4.tar.gz
+tar -xzf nose-1.3.4.tar.gz
+export PYTHONPATH=$(pwd)/nose-1.3.4:${PYTHONPATH}
+
 CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1"
 MASON_LIBS="${MASON_LINKED}/lib"
 MASON_INCLUDES="${MASON_LINKED}/include"
@@ -167,7 +165,7 @@ MASON_INCLUDES="${MASON_LINKED}/include"
   INPUT_PLUGINS=all \
   SAMPLE_INPUT_PLUGINS=True \
   SVG2PNG=True \
-  BENCHMARK=True \
+  BENCHMARK=False \
   SVG_RENDERER=True \
   PATH_REMOVE=/usr:/usr/local \
   RUNTIME_LINK=static \

From e26132cf9feade2d115c6d05b87821bbecb96173 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 23:51:54 -0800
Subject: [PATCH 14/21] travis cleanup

---
 .travis.yml  | 27 +++++----------------------
 bootstrap.sh | 29 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87d3d444d..b52df1bc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,34 +2,17 @@ language: cpp
 
 sudo: false
 
-# travis + ubuntugis with gdal and postggis leads to many potential dead-end conflicts
-# the below is thanks to https://github.com/CartoDB/Windshaft/blob/d82fe08b32fc7907bbe907ab290f8a082215ae26/.travis.yml#L1
-before_install:
-  - export PGUSER=postgres
-  #- sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
-  #- sudo apt-get -qq purge postgis* postgresql*
-  #- sudo apt-add-repository -y ppa:cartodb/postgresql-9.3
-  # enable to test against latest boost rather that v1.48
-  #- sudo add-apt-repository -y ppa:boost-latest/ppa
-  #- sudo rm -Rf /var/lib/postgresql /etc/postgresql
-  #- sudo apt-get update -qq
-  #- sudo apt-get install -q postgresql-9.3-postgis-2.1 postgresql-contrib-9.3
-  #- echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.3/main/pg_hba.conf
-  #- sudo service postgresql restart
+addons:
+  postgresql: "9.3"
 
 install:
- # enable to test against boost ppa
- #- sudo apt-get install -y ttf-wqy-microhei make valgrind python-nose 
-
-before_script:
- - psql -U postgres -c 'create database template_postgis'
- - psql -U postgres -c 'create extension postgis' -d template_postgis
+ - psql -U postgres -c 'create database template_postgis;' -U postgres
+ - psql -U postgres -c 'create extension postgis;' -d template_postgis -U postgres
 
 script:
  - source bootstrap.sh
- - cat config.log
  - JOBS=4 make
  - git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
  - make test
  #- source localize.sh && make grind
- - make bench
+ #- make bench
diff --git a/bootstrap.sh b/bootstrap.sh
index 51b69a447..2799dd92a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,31 +23,31 @@ SECURITY="http://security.ubuntu.com/ubuntu/pool/main/e/eglibc/"
 
 function setup_linux_cpp11_toolchain() {
   if [[ ! -d ${TOOLCHAIN} ]]; then
-      wget ${PPA}/libstdc%2B%2B6_4.8.1-2ubuntu1~12.04_amd64.deb
+      wget -q ${PPA}/libstdc%2B%2B6_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget ${PPA}/gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+      wget -q ${PPA}/gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget ${PPA}/g%2B%2B-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+      wget -q ${PPA}/g%2B%2B-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget ${PPA}/libisl10_0.12.2-2~12.04_amd64.deb
+      wget -q ${PPA}/libisl10_0.12.2-2~12.04_amd64.deb
       dpkg -x libisl10_0.12.2-2~12.04_amd64.deb ${TOOLCHAIN}
-      wget ${PPA}/libcloog-isl4_0.18.2-1~12.04_amd64.deb
+      wget -q ${PPA}/libcloog-isl4_0.18.2-1~12.04_amd64.deb
       dpkg -x libcloog-isl4_0.18.2-1~12.04_amd64.deb ${TOOLCHAIN}
-      wget ${PPA}/libstdc%2B%2B-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+      wget -q ${PPA}/libstdc%2B%2B-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
       ${PPA}/gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget ${PPA}/libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+      wget -q ${PPA}/libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget ${PPA}/libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
+      wget -q ${PPA}/libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget ${PPA}/cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+      wget -q ${PPA}/cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
       dpkg -x cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
   fi
 }
 
 function dpack() {
-  wget $1/$(echo $2 | sed 's/+/%2B/g')
+  wget -q $1/$(echo $2 | sed 's/+/%2B/g')
   dpkg -x $2 ${TOOLCHAIN}
 }
 
@@ -86,11 +86,11 @@ function setup_clang_toolchain() {
     #dpack ${PPA} gcc-4.8-locales_4.8.1-2ubuntu1~12.04_all.deb
     #export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/:${TOOLCHAIN}/usr/include/x86_64-linux-gnu:${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
     #dpack ${SECURITY} libc6-dev_2.15-0ubuntu10.9_amd64.deb
-    #wget http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-libc-dev_3.2.0-75.110_amd64.deb
+    #wget -q http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-libc-dev_3.2.0-75.110_amd64.deb
     #dpkg -x linux-libc-dev_3.2.0-75.110_amd64.deb ${TOOLCHAIN}
-    #wget http://mirrors.kernel.org/ubuntu/pool/main/b/binutils/binutils-gold_2.22-6ubuntu1.1_amd64.deb
+    #wget -q http://mirrors.kernel.org/ubuntu/pool/main/b/binutils/binutils-gold_2.22-6ubuntu1.1_amd64.deb
     #dpkg -x binutils-gold_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
-    #wget http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils_2.22-6ubuntu1.1_amd64.deb
+    #wget -q http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils_2.22-6ubuntu1.1_amd64.deb
     #dpkg -x binutils_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
 }
 
@@ -147,11 +147,12 @@ if [[ $(uname -s) == 'Linux' ]]; then
   setup_clang_toolchain
   export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
   export LD_LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}"
+  export LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${LIBRARY_PATH}"
   export PATH=${TOOLCHAIN}/usr/bin:$PATH
   #sudo apt-get -y install zlib1g-dev python-dev make git python-dev python-nose
 fi
 
-wget https://pypi.python.org/packages/source/n/nose/nose-1.3.4.tar.gz
+wget -q https://pypi.python.org/packages/source/n/nose/nose-1.3.4.tar.gz
 tar -xzf nose-1.3.4.tar.gz
 export PYTHONPATH=$(pwd)/nose-1.3.4:${PYTHONPATH}
 

From 2652649ea0458c4b17e0ffb9314983bbe857015a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 24 Jan 2015 08:41:06 -0800
Subject: [PATCH 15/21] scons: fix sqlite_rtree linux configure test in absence
 of pkg-config

---
 SConstruct | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 68583d292..67b0a2a55 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1462,7 +1462,7 @@ if not preconfigured:
                         sqlite_backup = env.Clone().Dictionary()
                         # if statically linking, on linux we likely
                         # need to link sqlite to pthreads and dl
-                        if env['RUNTIME_LINK'] == 'static':
+                        if env['RUNTIME_LINK'] == 'static' and not env['PLATFORM'] == 'Darwin':
                             if CHECK_PKG_CONFIG and conf.CheckPKG('sqlite3'):
                                 sqlite_env = env.Clone()
                                 try:
@@ -1472,7 +1472,10 @@ if not preconfigured:
                                             env["SQLITE_LINKFLAGS"].append(lib)
                                             env.Append(LIBS=lib)
                                 except OSError,e:
-                                    pass
+                                    for lib in ["sqlite3","dl","pthread"]:
+                                        if not lib in env['LIBS']:
+                                            env["SQLITE_LINKFLAGS"].append("lib")
+                                            env.Append(LIBS=lib)
                         SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
                         if not SQLITE_HAS_RTREE:
                             env.Replace(**sqlite_backup)

From d930265467b16ce588bae2bfe93e2f205812bb46 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 24 Jan 2015 08:42:05 -0800
Subject: [PATCH 16/21] mason bootstrap: ensure clang finds correct gcc-4.8 lib

---
 bootstrap.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 2799dd92a..6bad44396 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,6 +14,8 @@ todo
 - shrink icu data
 - cairo
 - benchmarks not linking to chrono
+- clang + libc++
+- pkg-config-less
 '
 
 TOOLCHAIN="$(pwd)/toolchain"
@@ -60,7 +62,9 @@ function test_cpp11() {
   echo 'return 0;' >> test.cpp
   echo '}' >> test.cpp
   echo ' ' >> test.cpp
-  ./toolchain/usr/bin/clang++-3.5 -o test test.cpp -std=c++11
+  # ensure no gcc 4.6 paths and that
+  # "./toolchain/usr/bin/../lib/gcc/x86_64-linux-gnu/4.8" is chosen
+  ./toolchain/usr/bin/clang++-3.5 -o test test.cpp -std=c++11 -v
 }
 
 # http://llvm.org/apt/precise/dists/llvm-toolchain-precise-3.5/main/binary-amd64/Packages
@@ -70,18 +74,18 @@ function setup_clang_toolchain() {
     dpack ${LLVM_DIST} libclang-common-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
     dpack ${PPA} libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb
     dpack ${PPA} libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+    dpack ${PPA} libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} g++-4.8-multilib_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
+    #dpack ${PPA} libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${LLVM_DIST} libclang1-3.5_3.5~svn215019-1~exp1_amd64.deb
     #dpack ${LLVM_DIST} libclang-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
     #dpack ${LLVM_DIST} llvm-3.5-runtime_3.5~svn215019-1~exp1_amd64.deb
-    #dpack ${PPA} libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} libisl10_0.12.2-2~12.04_amd64.deb
     #dpack ${PPA} libcloog-isl4_0.18.2-1~12.04_amd64.deb
-    #dpack ${PPA} g++-4.8-multilib_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
     #dpack ${PPA} gcc-4.8-locales_4.8.1-2ubuntu1~12.04_all.deb
     #export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/:${TOOLCHAIN}/usr/include/x86_64-linux-gnu:${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
@@ -92,6 +96,7 @@ function setup_clang_toolchain() {
     #dpkg -x binutils-gold_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
     #wget -q http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils_2.22-6ubuntu1.1_amd64.deb
     #dpkg -x binutils_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
+    # build-essential gets: binutils build-essential cpp cpp-4.6 dpkg-dev fakeroot g++ g++-4.6 gcc gcc-4.6 libalgorithm-diff-perl libalgorithm-diff-xs-perl libalgorithm-merge-perl libc-dev-bin libc6-dev libdpkg-perl libgomp1 libmpc2 libmpfr4 libquadmath0 libstdc++6-4.6-dev linux-libc-dev make manpages-dev
 }
 
 declare -A DEPS
@@ -113,6 +118,7 @@ DEPS["boost_libregex"]="1.57.0"
 DEPS["boost_libpython"]="1.57.0"
 DEPS["gdal"]="1.11.1"
 DEPS["libpq"]="9.4.0"
+DEPS["sqlite"]="3.8.6"
 
 if [[ -d ~/.mason ]]; then
     export PATH=~/.mason:$PATH
@@ -141,13 +147,14 @@ export PKG_CONFIG_PATH="${MASON_LINKED}/lib/pkgconfig"
 export C_INCLUDE_PATH="${MASON_LINKED}/include"
 export CPLUS_INCLUDE_PATH="${MASON_LINKED}/include"
 export LIBRARY_PATH="${MASON_LINKED}/lib"
+export PATH="${MASON_LINKED}/bin":${PATH}
 
 if [[ $(uname -s) == 'Linux' ]]; then
   #setup_linux_cpp11_toolchain
   setup_clang_toolchain
   export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
-  export LD_LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}"
-  export LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${LIBRARY_PATH}"
+  export LD_LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${TOOLCHAIN}/usr/lib/gcc/x86_64-linux-gnu/4.8/:${LD_LIBRARY_PATH}"
+  export LIBRARY_PATH="${LD_LIBRARY_PATH}"
   export PATH=${TOOLCHAIN}/usr/bin:$PATH
   #sudo apt-get -y install zlib1g-dev python-dev make git python-dev python-nose
 fi
@@ -168,6 +175,7 @@ MASON_INCLUDES="${MASON_LINKED}/include"
   SVG2PNG=True \
   BENCHMARK=False \
   SVG_RENDERER=True \
+  PATH="${MASON_LINKED}/bin" \
   PATH_REMOVE=/usr:/usr/local \
   RUNTIME_LINK=static \
   CUSTOM_LDFLAGS="-L${MASON_LIBS}" \

From 93570f820a6c5675dea9c686077f1ec99739607f Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 24 Jan 2015 08:51:16 -0800
Subject: [PATCH 17/21] mason bootstrap: expat and sqlite_rtree fixes

---
 SConstruct   | 5 +++++
 bootstrap.sh | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/SConstruct b/SConstruct
index 67b0a2a55..5242ae558 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1476,6 +1476,11 @@ if not preconfigured:
                                         if not lib in env['LIBS']:
                                             env["SQLITE_LINKFLAGS"].append("lib")
                                             env.Append(LIBS=lib)
+                            else:
+                                for lib in ["sqlite3","dl","pthread"]:
+                                    if not lib in env['LIBS']:
+                                        env["SQLITE_LINKFLAGS"].append("lib")
+                                        env.Append(LIBS=lib)
                         SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
                         if not SQLITE_HAS_RTREE:
                             env.Replace(**sqlite_backup)
diff --git a/bootstrap.sh b/bootstrap.sh
index 6bad44396..aee8a79c5 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -119,6 +119,9 @@ DEPS["boost_libpython"]="1.57.0"
 DEPS["gdal"]="1.11.1"
 DEPS["libpq"]="9.4.0"
 DEPS["sqlite"]="3.8.6"
+# gdal deps
+DEPS["expat"]="2.1.0"
+
 
 if [[ -d ~/.mason ]]; then
     export PATH=~/.mason:$PATH

From 3e8b7011941a8f42b8b95f5c672d0a3a341f65ba Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 24 Jan 2015 10:05:58 -0800
Subject: [PATCH 18/21] bootstrap cleanups

---
 .travis.yml  |   3 +-
 Makefile     |  14 +++
 bootstrap.sh | 292 ++++++++++++++++++++++-----------------------------
 3 files changed, 143 insertions(+), 166 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b52df1bc6..5074f5658 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,8 @@ install:
 
 script:
  - source bootstrap.sh
- - JOBS=4 make
+ - ./configure
+ - JOBS=6 make
  - git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
  - make test
  #- source localize.sh && make grind
diff --git a/Makefile b/Makefile
index 0ae5d4160..e0e229dc5 100755
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,20 @@ install:
 	$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 install
 
 mapnik:
+	# we first build memory intensive files with -j1
+	$(PYTHON) scons/scons.py -j1 \
+		--config=cache --implicit-cache --max-drift=1 \
+		src/json/libmapnik-json.a \
+		src/wkt/libmapnik-wkt.a \
+		src/css_color_grammar.os \
+		src/expression_grammar.os \
+		src/transform_expression_grammar.os \
+		src/image_filter_types.os \
+		src/renderer_common/process_group_symbolizer.cpp \
+		src/agg/process_markers_symbolizer.cpp \
+		src/grid/process_markers_symbolizer.cpp \
+		src/cairo/process_markers_symbolizer.cpp
+	# then install the rest with -j$(JOBS)
 	$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1
 
 clean:
diff --git a/bootstrap.sh b/bootstrap.sh
index aee8a79c5..ca9f60a95 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -9,96 +9,16 @@
 
 todo
 
-- gdal shared lib
+- clang debs to s3
+- docs for base setup: sudo apt-get -y install zlib1g-dev python-dev make git python-dev
 - boost_python_patch
 - shrink icu data
-- cairo
-- benchmarks not linking to chrono
+- cairo/pycairo
 - clang + libc++
 - pkg-config-less
+- gdal shared lib?
 '
 
-TOOLCHAIN="$(pwd)/toolchain"
-PPA="https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test/+files"
-LLVM_DIST="http://llvm.org/apt/precise/pool/main/l/llvm-toolchain-3.5"
-SECURITY="http://security.ubuntu.com/ubuntu/pool/main/e/eglibc/"
-
-function setup_linux_cpp11_toolchain() {
-  if [[ ! -d ${TOOLCHAIN} ]]; then
-      wget -q ${PPA}/libstdc%2B%2B6_4.8.1-2ubuntu1~12.04_amd64.deb
-      dpkg -x libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget -q ${PPA}/gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
-      dpkg -x gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget -q ${PPA}/g%2B%2B-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
-      dpkg -x g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget -q ${PPA}/libisl10_0.12.2-2~12.04_amd64.deb
-      dpkg -x libisl10_0.12.2-2~12.04_amd64.deb ${TOOLCHAIN}
-      wget -q ${PPA}/libcloog-isl4_0.18.2-1~12.04_amd64.deb
-      dpkg -x libcloog-isl4_0.18.2-1~12.04_amd64.deb ${TOOLCHAIN}
-      wget -q ${PPA}/libstdc%2B%2B-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
-      dpkg -x libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      ${PPA}/gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
-      dpkg -x gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget -q ${PPA}/libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
-      dpkg -x libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget -q ${PPA}/libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
-      dpkg -x libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-      wget -q ${PPA}/cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
-      dpkg -x cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
-  fi
-}
-
-function dpack() {
-  wget -q $1/$(echo $2 | sed 's/+/%2B/g')
-  dpkg -x $2 ${TOOLCHAIN}
-}
-
-function test_cpp11() {
-  echo '#include <iostream>' > test.cpp
-  echo ' ' >> test.cpp
-  echo 'int main() {' >> test.cpp
-  echo ' ' >> test.cpp
-  echo 'std::move("hello");' >> test.cpp
-  echo 'return 0;' >> test.cpp
-  echo '}' >> test.cpp
-  echo ' ' >> test.cpp
-  # ensure no gcc 4.6 paths and that
-  # "./toolchain/usr/bin/../lib/gcc/x86_64-linux-gnu/4.8" is chosen
-  ./toolchain/usr/bin/clang++-3.5 -o test test.cpp -std=c++11 -v
-}
-
-# http://llvm.org/apt/precise/dists/llvm-toolchain-precise-3.5/main/binary-amd64/Packages
-function setup_clang_toolchain() {
-    dpack ${LLVM_DIST} clang-3.5_3.5~svn217304-1~exp1_amd64.deb
-    dpack ${LLVM_DIST} libllvm3.5_3.5~svn217304-1~exp1_amd64.deb
-    dpack ${LLVM_DIST} libclang-common-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
-    dpack ${PPA} libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb
-    dpack ${PPA} libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
-    dpack ${PPA} libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} g++-4.8-multilib_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${LLVM_DIST} libclang1-3.5_3.5~svn215019-1~exp1_amd64.deb
-    #dpack ${LLVM_DIST} libclang-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
-    #dpack ${LLVM_DIST} llvm-3.5-runtime_3.5~svn215019-1~exp1_amd64.deb
-    #dpack ${PPA} g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} libisl10_0.12.2-2~12.04_amd64.deb
-    #dpack ${PPA} libcloog-isl4_0.18.2-1~12.04_amd64.deb
-    #dpack ${PPA} g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
-    #dpack ${PPA} gcc-4.8-locales_4.8.1-2ubuntu1~12.04_all.deb
-    #export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/:${TOOLCHAIN}/usr/include/x86_64-linux-gnu:${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
-    #dpack ${SECURITY} libc6-dev_2.15-0ubuntu10.9_amd64.deb
-    #wget -q http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-libc-dev_3.2.0-75.110_amd64.deb
-    #dpkg -x linux-libc-dev_3.2.0-75.110_amd64.deb ${TOOLCHAIN}
-    #wget -q http://mirrors.kernel.org/ubuntu/pool/main/b/binutils/binutils-gold_2.22-6ubuntu1.1_amd64.deb
-    #dpkg -x binutils-gold_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
-    #wget -q http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils_2.22-6ubuntu1.1_amd64.deb
-    #dpkg -x binutils_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
-    # build-essential gets: binutils build-essential cpp cpp-4.6 dpkg-dev fakeroot g++ g++-4.6 gcc gcc-4.6 libalgorithm-diff-perl libalgorithm-diff-xs-perl libalgorithm-merge-perl libc-dev-bin libc6-dev libdpkg-perl libgomp1 libmpc2 libmpfr4 libquadmath0 libstdc++6-4.6-dev linux-libc-dev make manpages-dev
-}
-
 declare -A DEPS
 DEPS["freetype"]="2.5.4"
 DEPS["harfbuzz"]="2cd5323"
@@ -116,98 +36,140 @@ DEPS["boost_libfilesystem"]="1.57.0"
 DEPS["boost_libprogram_options"]="1.57.0"
 DEPS["boost_libregex"]="1.57.0"
 DEPS["boost_libpython"]="1.57.0"
-DEPS["gdal"]="1.11.1"
 DEPS["libpq"]="9.4.0"
 DEPS["sqlite"]="3.8.6"
-# gdal deps
+DEPS["gdal"]="1.11.1"
 DEPS["expat"]="2.1.0"
 
+CPP11_TOOLCHAIN="$(pwd)/toolchain"
 
-if [[ -d ~/.mason ]]; then
-    export PATH=~/.mason:$PATH
-else
-    if [[ ! -d mason ]]; then
-        git clone --depth 1 https://github.com/mapbox/mason.git ./.mason
+function dpack() {
+    if [[ ! -f $2 ]]; then
+        wget -q $1/$(echo $2 | sed 's/+/%2B/g')
+        dpkg -x $2 ${CPP11_TOOLCHAIN}
     fi
-    export MASON_DIR=$(pwd)/.mason
-    export PATH=$(pwd)/.mason:$PATH
-fi
+}
 
-for DEP in "${!DEPS[@]}"; do
-    mason install ${DEP} ${DEPS[$DEP]}
-done
+function setup_cpp11_toolchain() {
+    if [[ $(uname -s) == 'Linux' ]]; then
+        local PPA="https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test/+files"
+        # http://llvm.org/apt/precise/dists/llvm-toolchain-precise-3.5/main/binary-amd64/Packages
+        # TODO: cache these for faster downloads
+        local LLVM_DIST="http://llvm.org/apt/precise/pool/main/l/llvm-toolchain-3.5"
+        dpack ${LLVM_DIST} clang-3.5_3.5~svn217304-1~exp1_amd64.deb
+        dpack ${LLVM_DIST} libllvm3.5_3.5~svn217304-1~exp1_amd64.deb
+        dpack ${LLVM_DIST} libclang-common-3.5-dev_3.5~svn215019-1~exp1_amd64.deb
+        dpack ${PPA} libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb
+        dpack ${PPA} libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+        dpack ${PPA} libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
+        export CPLUS_INCLUDE_PATH="${CPP11_TOOLCHAIN}/usr/include/c++/4.8:${CPP11_TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
+        export LD_LIBRARY_PATH="${CPP11_TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${CPP11_TOOLCHAIN}/usr/lib/gcc/x86_64-linux-gnu/4.8/:${LD_LIBRARY_PATH}"
+        export LIBRARY_PATH="${LD_LIBRARY_PATH}"
+        export PATH="${CPP11_TOOLCHAIN}/usr/bin":${PATH}
+        export CXX="${CPP11_TOOLCHAIN}/usr/bin/clang++-3.5"
+        export CC="${CPP11_TOOLCHAIN}/usr/bin/clang-3.5"
+    else
+        export CXX=clang++
+        export CC=clang
+    fi
+}
 
-for DEP in "${!DEPS[@]}"; do
-    mason link ${DEP} ${DEPS[$DEP]}
-done
+function setup_mason() {
+    if [[ -d ~/.mason ]]; then
+        export PATH=~/.mason:$PATH
+    else
+        if [[ ! -d mason ]]; then
+            git clone --depth 1 https://github.com/mapbox/mason.git ./.mason
+        fi
+        export MASON_DIR=$(pwd)/.mason
+        export PATH=$(pwd)/.mason:$PATH
+    fi
+}
 
-MASON_LINKED=$(pwd)/mason_packages/.link
+function install_mason_deps() {
+    if [[ ! -d ./mason_packages ]]; then
+        for DEP in "${!DEPS[@]}"; do
+            mason install ${DEP} ${DEPS[$DEP]}
+        done
+    fi
+    if [[ ! -d ./mason_packages/.link ]]; then
+        for DEP in "${!DEPS[@]}"; do
+            mason link ${DEP} ${DEPS[$DEP]}
+        done
+    fi
+}
 
-export PROJ_LIB=${MASON_LINKED}/share/proj/
-export ICU_DATA=${MASON_LINKED}/share/icu/54.1/
-export GDAL_DATA=${MASON_LINKED}/share/gdal
-export PKG_CONFIG_PATH="${MASON_LINKED}/lib/pkgconfig"
-export C_INCLUDE_PATH="${MASON_LINKED}/include"
-export CPLUS_INCLUDE_PATH="${MASON_LINKED}/include"
-export LIBRARY_PATH="${MASON_LINKED}/lib"
-export PATH="${MASON_LINKED}/bin":${PATH}
+function setup_nose() {
+    if [[ ! -d $(pwd)/nose-1.3.4 ]]; then
+        wget -q https://pypi.python.org/packages/source/n/nose/nose-1.3.4.tar.gz
+        tar -xzf nose-1.3.4.tar.gz
+    fi
+    export PYTHONPATH=$(pwd)/nose-1.3.4:${PYTHONPATH}
+}
 
-if [[ $(uname -s) == 'Linux' ]]; then
-  #setup_linux_cpp11_toolchain
-  setup_clang_toolchain
-  export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
-  export LD_LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${TOOLCHAIN}/usr/lib/gcc/x86_64-linux-gnu/4.8/:${LD_LIBRARY_PATH}"
-  export LIBRARY_PATH="${LD_LIBRARY_PATH}"
-  export PATH=${TOOLCHAIN}/usr/bin:$PATH
-  #sudo apt-get -y install zlib1g-dev python-dev make git python-dev python-nose
-fi
+function make_config() {
+    local MASON_LINKED=./mason_packages/.link
+    export PROJ_LIB=${MASON_LINKED}/share/proj/
+    export ICU_DATA=${MASON_LINKED}/share/icu/54.1/
+    export GDAL_DATA=${MASON_LINKED}/share/gdal
+    export PKG_CONFIG_PATH="${MASON_LINKED}/lib/pkgconfig"
+    export C_INCLUDE_PATH="${MASON_LINKED}/include"
+    export CPLUS_INCLUDE_PATH="${MASON_LINKED}/include"
+    export LIBRARY_PATH="${MASON_LINKED}/lib"
+    export PATH="${MASON_LINKED}/bin":${PATH}
 
-wget -q https://pypi.python.org/packages/source/n/nose/nose-1.3.4.tar.gz
-tar -xzf nose-1.3.4.tar.gz
-export PYTHONPATH=$(pwd)/nose-1.3.4:${PYTHONPATH}
+    local CUSTOM_CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1"
+    local MASON_LIBS="${MASON_LINKED}/lib"
+    local MASON_INCLUDES="${MASON_LINKED}/include"
+    echo "
+CUSTOM_CXXFLAGS = '-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1'
+CUSTOM_LDFLAGS = '-L${MASON_LINKED}/lib'
+RUNTIME_LINK = 'static'
+INPUT_PLUGINS = 'csv,gdal,geojson,occi,ogr,osm,pgraster,postgis,python,raster,rasterlite,shape,sqlite,topojson'
+PREFIX = '/opt/mapnik-3.x'
+PATH = '${MASON_LINKED}/bin'
+PATH_REMOVE = '/usr:/usr/local'
+MAPNIK_NAME = 'mapnik_3-0-0'
+BOOST_INCLUDES = '${MASON_LINKED}/include'
+BOOST_LIBS = '${MASON_LINKED}/lib'
+BOOST_PYTHON_LIB = 'boost_python-2.7'
+ICU_INCLUDES = '${MASON_LINKED}/include'
+ICU_LIBS = '${MASON_LINKED}/lib'
+HB_INCLUDES = '${MASON_LINKED}/include'
+HB_LIBS = '${MASON_LINKED}/lib'
+PNG_INCLUDES = '${MASON_LINKED}/include/libpng16'
+PNG_LIBS = '${MASON_LINKED}/lib'
+JPEG_INCLUDES = '${MASON_LINKED}/include'
+JPEG_LIBS = '${MASON_LINKED}/lib'
+TIFF_INCLUDES = '${MASON_LINKED}/include'
+TIFF_LIBS = '${MASON_LINKED}/lib'
+WEBP_INCLUDES = '${MASON_LINKED}/include'
+WEBP_LIBS = '${MASON_LINKED}/lib'
+PROJ_INCLUDES = '${MASON_LINKED}/include'
+PROJ_LIBS = '${MASON_LINKED}/lib'
+FREETYPE_INCLUDES = '${MASON_LINKED}/include/freetype2'
+FREETYPE_LIBS = '${MASON_LINKED}/lib'
+XML2_INCLUDES = '${MASON_LINKED}/include/libxml2'
+XML2_LIBS = '${MASON_LINKED}/lib'
+SVG_RENDERER = True
+CAIRO_INCLUDES = '${MASON_LINKED}/include'
+CAIRO_LIBS = '${MASON_LINKED}/lib'
+SQLITE_INCLUDES = '${MASON_LINKED}/include'
+SQLITE_LIBS = '${MASON_LINKED}/lib'
+FRAMEWORK_PYTHON = False
+BINDINGS = 'python'
+XMLPARSER = 'ptree'
+SVG2PNG = True
+SAMPLE_INPUT_PLUGINS = True
+" > ./config.py
+}
 
-CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1"
-MASON_LIBS="${MASON_LINKED}/lib"
-MASON_INCLUDES="${MASON_LINKED}/include"
+function main() {
+    setup_mason
+    install_mason_deps
+    setup_nose
+    setup_cpp11_toolchain
+    make_config
+}
 
-./configure \
-  CC=${TOOLCHAIN}/usr/bin/clang-3.5 \
-  CXX=${TOOLCHAIN}/usr/bin/clang++-3.5 \
-  INPUT_PLUGINS=all \
-  SAMPLE_INPUT_PLUGINS=True \
-  SVG2PNG=True \
-  BENCHMARK=False \
-  SVG_RENDERER=True \
-  PATH="${MASON_LINKED}/bin" \
-  PATH_REMOVE=/usr:/usr/local \
-  RUNTIME_LINK=static \
-  CUSTOM_LDFLAGS="-L${MASON_LIBS}" \
-  CUSTOM_CXXFLAGS="${CXXFLAGS}" \
-  BOOST_INCLUDES="${MASON_INCLUDES}" \
-  BOOST_LIBS="${MASON_LIBS}" \
-  ICU_INCLUDES="${MASON_INCLUDES}" \
-  ICU_LIBS="${MASON_LIBS}" \
-  FREETYPE_INCLUDES="${MASON_INCLUDES}/freetype2" \
-  FREETYPE_LIBS="${MASON_LIBS}" \
-  XML2_INCLUDES="${MASON_INCLUDES}/libxml2" \
-  XML2_LIBS="${MASON_LIBS}" \
-  PNG_INCLUDES="${MASON_INCLUDES}/libpng16" \
-  PNG_LIBS="${MASON_LIBS}" \
-  JPEG_INCLUDES="${MASON_INCLUDES}" \
-  JPEG_LIBS="${MASON_LIBS}" \
-  WEBP_INCLUDES="${MASON_INCLUDES}" \
-  WEBP_LIBS="${MASON_LIBS}" \
-  TIFF_INCLUDES="${MASON_INCLUDES}" \
-  TIFF_LIBS="${MASON_LIBS}" \
-  PROJ_INCLUDES="${MASON_INCLUDES}" \
-  PROJ_LIBS="${MASON_LIBS}" \
-  CAIRO_INCLUDES="${MASON_INCLUDES}" \
-  CAIRO_LIBS="${MASON_LIBS}" \
-  SQLITE_INCLUDES="${MASON_INCLUDES}" \
-  SQLITE_LIBS="${MASON_LIBS}" \
-  HB_INCLUDES="${MASON_INCLUDES}" \
-  HB_LIBS="${MASON_LIBS}" \
-  SQLITE_INCLUDES="${MASON_INCLUDES}" \
-  SQLITE_LIBS="${MASON_LIBS}" \
-  SQLITE_INCLUDES="${MASON_INCLUDES}" \
-  SQLITE_LIBS="${MASON_LIBS}" \
+main

From c69b4b1151bd81cea6530f759e49dcb074ecc4d2 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 24 Jan 2015 10:07:26 -0800
Subject: [PATCH 19/21] fix mason dir check

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

diff --git a/bootstrap.sh b/bootstrap.sh
index ca9f60a95..e267ee521 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -78,7 +78,7 @@ function setup_mason() {
     if [[ -d ~/.mason ]]; then
         export PATH=~/.mason:$PATH
     else
-        if [[ ! -d mason ]]; then
+        if [[ ! -d ./.mason ]]; then
             git clone --depth 1 https://github.com/mapbox/mason.git ./.mason
         fi
         export MASON_DIR=$(pwd)/.mason

From 80a141da78ea0a5ee3f8469d4e0bba3604f65b71 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 24 Jan 2015 10:10:07 -0800
Subject: [PATCH 20/21] config.py generation fixups

---
 bootstrap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index e267ee521..9ebb0cd83 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -122,6 +122,8 @@ function make_config() {
     local MASON_LIBS="${MASON_LINKED}/lib"
     local MASON_INCLUDES="${MASON_LINKED}/include"
     echo "
+CXX = '$CXX'
+CC = '$CC'
 CUSTOM_CXXFLAGS = '-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1'
 CUSTOM_LDFLAGS = '-L${MASON_LINKED}/lib'
 RUNTIME_LINK = 'static'
@@ -132,7 +134,6 @@ PATH_REMOVE = '/usr:/usr/local'
 MAPNIK_NAME = 'mapnik_3-0-0'
 BOOST_INCLUDES = '${MASON_LINKED}/include'
 BOOST_LIBS = '${MASON_LINKED}/lib'
-BOOST_PYTHON_LIB = 'boost_python-2.7'
 ICU_INCLUDES = '${MASON_LINKED}/include'
 ICU_LIBS = '${MASON_LINKED}/lib'
 HB_INCLUDES = '${MASON_LINKED}/include'

From 8d6b70ea70e27695f56eb880819ce5534b8fa99b Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 24 Jan 2015 10:18:32 -0800
Subject: [PATCH 21/21] bootstrap: split build time and runtime settings

---
 bootstrap.sh | 79 ++++++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 9ebb0cd83..5b661430a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -108,55 +108,52 @@ function setup_nose() {
 }
 
 function make_config() {
-    local MASON_LINKED=./mason_packages/.link
-    export PROJ_LIB=${MASON_LINKED}/share/proj/
-    export ICU_DATA=${MASON_LINKED}/share/icu/54.1/
-    export GDAL_DATA=${MASON_LINKED}/share/gdal
-    export PKG_CONFIG_PATH="${MASON_LINKED}/lib/pkgconfig"
-    export C_INCLUDE_PATH="${MASON_LINKED}/include"
-    export CPLUS_INCLUDE_PATH="${MASON_LINKED}/include"
-    export LIBRARY_PATH="${MASON_LINKED}/lib"
-    export PATH="${MASON_LINKED}/bin":${PATH}
+    local MASON_LINKED_REL=./mason_packages/.link
+    export PKG_CONFIG_PATH="${MASON_LINKED_REL}/lib/pkgconfig"
+    export C_INCLUDE_PATH="${MASON_LINKED_REL}/include"
+    export CPLUS_INCLUDE_PATH="${MASON_LINKED_REL}/include"
+    export LIBRARY_PATH="${MASON_LINKED_REL}/lib"
+    export PATH="${MASON_LINKED_REL}/bin":${PATH}
 
     local CUSTOM_CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1"
-    local MASON_LIBS="${MASON_LINKED}/lib"
-    local MASON_INCLUDES="${MASON_LINKED}/include"
+    local MASON_LIBS="${MASON_LINKED_REL}/lib"
+    local MASON_INCLUDES="${MASON_LINKED_REL}/include"
     echo "
 CXX = '$CXX'
 CC = '$CC'
 CUSTOM_CXXFLAGS = '-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1'
-CUSTOM_LDFLAGS = '-L${MASON_LINKED}/lib'
+CUSTOM_LDFLAGS = '-L${MASON_LINKED_REL}/lib'
 RUNTIME_LINK = 'static'
 INPUT_PLUGINS = 'csv,gdal,geojson,occi,ogr,osm,pgraster,postgis,python,raster,rasterlite,shape,sqlite,topojson'
 PREFIX = '/opt/mapnik-3.x'
-PATH = '${MASON_LINKED}/bin'
+PATH = '${MASON_LINKED_REL}/bin'
 PATH_REMOVE = '/usr:/usr/local'
 MAPNIK_NAME = 'mapnik_3-0-0'
-BOOST_INCLUDES = '${MASON_LINKED}/include'
-BOOST_LIBS = '${MASON_LINKED}/lib'
-ICU_INCLUDES = '${MASON_LINKED}/include'
-ICU_LIBS = '${MASON_LINKED}/lib'
-HB_INCLUDES = '${MASON_LINKED}/include'
-HB_LIBS = '${MASON_LINKED}/lib'
-PNG_INCLUDES = '${MASON_LINKED}/include/libpng16'
-PNG_LIBS = '${MASON_LINKED}/lib'
-JPEG_INCLUDES = '${MASON_LINKED}/include'
-JPEG_LIBS = '${MASON_LINKED}/lib'
-TIFF_INCLUDES = '${MASON_LINKED}/include'
-TIFF_LIBS = '${MASON_LINKED}/lib'
-WEBP_INCLUDES = '${MASON_LINKED}/include'
-WEBP_LIBS = '${MASON_LINKED}/lib'
-PROJ_INCLUDES = '${MASON_LINKED}/include'
-PROJ_LIBS = '${MASON_LINKED}/lib'
-FREETYPE_INCLUDES = '${MASON_LINKED}/include/freetype2'
-FREETYPE_LIBS = '${MASON_LINKED}/lib'
-XML2_INCLUDES = '${MASON_LINKED}/include/libxml2'
-XML2_LIBS = '${MASON_LINKED}/lib'
+BOOST_INCLUDES = '${MASON_LINKED_REL}/include'
+BOOST_LIBS = '${MASON_LINKED_REL}/lib'
+ICU_INCLUDES = '${MASON_LINKED_REL}/include'
+ICU_LIBS = '${MASON_LINKED_REL}/lib'
+HB_INCLUDES = '${MASON_LINKED_REL}/include'
+HB_LIBS = '${MASON_LINKED_REL}/lib'
+PNG_INCLUDES = '${MASON_LINKED_REL}/include/libpng16'
+PNG_LIBS = '${MASON_LINKED_REL}/lib'
+JPEG_INCLUDES = '${MASON_LINKED_REL}/include'
+JPEG_LIBS = '${MASON_LINKED_REL}/lib'
+TIFF_INCLUDES = '${MASON_LINKED_REL}/include'
+TIFF_LIBS = '${MASON_LINKED_REL}/lib'
+WEBP_INCLUDES = '${MASON_LINKED_REL}/include'
+WEBP_LIBS = '${MASON_LINKED_REL}/lib'
+PROJ_INCLUDES = '${MASON_LINKED_REL}/include'
+PROJ_LIBS = '${MASON_LINKED_REL}/lib'
+FREETYPE_INCLUDES = '${MASON_LINKED_REL}/include/freetype2'
+FREETYPE_LIBS = '${MASON_LINKED_REL}/lib'
+XML2_INCLUDES = '${MASON_LINKED_REL}/include/libxml2'
+XML2_LIBS = '${MASON_LINKED_REL}/lib'
 SVG_RENDERER = True
-CAIRO_INCLUDES = '${MASON_LINKED}/include'
-CAIRO_LIBS = '${MASON_LINKED}/lib'
-SQLITE_INCLUDES = '${MASON_LINKED}/include'
-SQLITE_LIBS = '${MASON_LINKED}/lib'
+CAIRO_INCLUDES = '${MASON_LINKED_REL}/include'
+CAIRO_LIBS = '${MASON_LINKED_REL}/lib'
+SQLITE_INCLUDES = '${MASON_LINKED_REL}/include'
+SQLITE_LIBS = '${MASON_LINKED_REL}/lib'
 FRAMEWORK_PYTHON = False
 BINDINGS = 'python'
 XMLPARSER = 'ptree'
@@ -165,12 +162,20 @@ SAMPLE_INPUT_PLUGINS = True
 " > ./config.py
 }
 
+function setup_runtime_settings() {
+    local MASON_LINKED_ABS=$(pwd)/mason_packages/.link
+    export PROJ_LIB=${MASON_LINKED_ABS}/share/proj/
+    export ICU_DATA=${MASON_LINKED_ABS}/share/icu/54.1/
+    export GDAL_DATA=${MASON_LINKED_ABS}/share/gdal
+}
+
 function main() {
     setup_mason
     install_mason_deps
     setup_nose
     setup_cpp11_toolchain
     make_config
+    setup_runtime_settings
 }
 
 main