upgrade to latest mason and latest boost via mason

This commit is contained in:
Dane Springmeyer 2016-05-19 19:37:26 -04:00
parent 20a9112135
commit d7b6b5669b

View file

@ -10,7 +10,7 @@ todo
- shrink icu data - shrink icu data
' '
MASON_VERSION="694d08c" MASON_VERSION="3e0cc5a"
function setup_mason() { function setup_mason() {
if [[ ! -d ./.mason ]]; then if [[ ! -d ./.mason ]]; then
@ -20,7 +20,6 @@ function setup_mason() {
echo "Updating to latest mason" echo "Updating to latest mason"
(cd ./.mason && git fetch && git checkout ${MASON_VERSION}) (cd ./.mason && git fetch && git checkout ${MASON_VERSION})
fi fi
export MASON_DIR=$(pwd)/.mason
export PATH=$(pwd)/.mason:$PATH export PATH=$(pwd)/.mason:$PATH
export CXX=${CXX:-clang++} export CXX=${CXX:-clang++}
export CC=${CC:-clang} export CC=${CC:-clang}
@ -63,8 +62,11 @@ function install_mason_deps() {
wait wait
install webp 0.4.2 libwebp & install webp 0.4.2 libwebp &
install gdal 1.11.2 libgdal & install gdal 1.11.2 libgdal &
install boost 1.59.0 & install boost 1.61.0 &
install boost_liball 1.59.0 & install boost_libsystem 1.61.0 &
install boost_libfilesystem 1.61.0 &
install boost_libprogram_options 1.61.0 &
install boost_libregex 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 &
wait wait