diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-21 06:57:44 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-21 06:57:44 -0700 |
commit | 59d0be10760d22b279142422a47451a60ae06634 (patch) | |
tree | 054c027e8adade3c2b5cca4bae643ac11789e2db /scripts | |
parent | dddd1c275ce01244efef3d591e0efde449d648b0 (diff) | |
download | qtlocation-mapboxgl-59d0be10760d22b279142422a47451a60ae06634.tar.gz |
use ppa for more recent boost
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/flags.sh | 3 | ||||
-rwxr-xr-x | scripts/travis_before_install.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/flags.sh b/scripts/flags.sh index 58aee18a04..c3c36a6404 100755 --- a/scripts/flags.sh +++ b/scripts/flags.sh @@ -6,7 +6,8 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # use g++ that supports c++11 if [[ ${CXX} == "g++" ]]; then - export CXX="g++-4.8" ; + export CXX="g++-4.8" + export CXX="gcc-4.8" fi # If building in debug then turn on sanitizers. diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index a77aa703e3..31315dce38 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -10,11 +10,12 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then if [[ `lsb_release -r` =~ "12.04" ]]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test fi + sudo add-apt-repository --yes ppa:boost-latest/ppa sudo apt-get update -y sudo apt-get -y install gcc-4.8 g++-4.8 sudo apt-get -y install git build-essential zlib1g-dev automake \ libtool xutils-dev make cmake pkg-config python-pip \ - libboost-dev libboost-regex-dev libcurl4-openssl-dev \ + libboost1.55-dev libboost-regex1.55-dev libcurl4-openssl-dev \ libpng-dev libsqlite3-dev sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev \ x11proto-xext-dev libxrandr-dev \ |