Merge branch 'master' into tidy-headers

This commit is contained in:
artemp 2016-08-11 10:18:46 +01:00
commit 451bd3c370

View file

@ -67,6 +67,10 @@ function install_mason_deps() {
install boost_libfilesystem 1.61.0 & install boost_libfilesystem 1.61.0 &
install boost_libprogram_options 1.61.0 & install boost_libprogram_options 1.61.0 &
install boost_libregex_icu 1.61.0 & install boost_libregex_icu 1.61.0 &
# technically boost thread and python are not a core dep, but installing
# here by default helps make python-mapnik builds easier
install boost_libthread 1.61.0 &
install boost_libpython 1.61.0 &
install freetype 2.6 libfreetype & install freetype 2.6 libfreetype &
install harfbuzz 0.9.41 libharfbuzz & install harfbuzz 0.9.41 libharfbuzz &
for job in $(jobs -p) for job in $(jobs -p)