upgrade to boost 1.60.0 now that mapnik/mapnik#3333 is resolved

mapnik · May 6, 2016 · c2b4603 · c2b4603
1 parent 199e08f
commit c2b4603
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/osx/scripts/build_boost.sh b/osx/scripts/build_boost.sh
@@ -40,7 +40,7 @@ fi
 # patch to workaround crashes in python.input
 # https://github.com/mapnik/mapnik/issues/1968
 patch -N libs/python/src/converter/builtin_converters.cpp ${PATCHES}/boost_python_shared_ptr_gil.diff || true
-#patch -N libs/regex/build/has_icu_test.cpp ${PATCHES}/boost_icu_check.diff || true
+patch -N libs/regex/build/has_icu_test.cpp ${PATCHES}/boost_icu_check.diff || true
 
 gen_config() {
   echoerr 'generating user-config.jam'

diff --git a/osx/settings.sh b/osx/settings.sh
@@ -427,8 +427,8 @@ export ICU_VERSION="56.1"
 export ICU_VERSION2="56_1"
 # http://www.boost.org/users/download/
 # bz2
-export BOOST_VERSION="1.59.0"
-export BOOST_VERSION2="1_59_0"
+export BOOST_VERSION="1.60.0"
+export BOOST_VERSION2="1_60_0"
 # http://www.sqlite.org/download.html
 export SQLITE_VERSION="3110000"
 # http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2