diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2016-11-11 16:00:56 -0800 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2016-11-11 16:00:56 -0800 |
| commit | 4240cae4349eee4c49f522ca29983826ced0f134 (patch) | |
| tree | f8c1e451fe337a558516aed104eee40cffa7d51a | |
| parent | fcdaa0b49fd2f01f82a6c4ab6fc66201384aa6b0 (diff) | |
| download | qtlocation-mapboxgl-4240cae4349eee4c49f522ca29983826ced0f134.tar.gz | |
attempt to build against alt mesa packages
| m--------- | .mason | 0 | ||||
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 2 | ||||
| -rwxr-xr-x | scripts/travis_setup.sh | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/.mason b/.mason -Subproject 43933edabaca8f877f270466d20759fe84e62b2 +Subproject 1561fd7319533ac816350e637c90c90a2499fbf diff --git a/.travis.yml b/.travis.yml index ac40463011..6c452900ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,23 +6,23 @@ addons_shortcuts: addons_clang38: &clang38 apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'libstdc++-5-dev', 'libstdc++6', 'libllvm3.8v4', + packages: [ 'libstdc++-5-dev', 'libstdc++6', 'libxrandr-dev', 'libxcursor-dev', 'libxinerama-dev' ] addons_gcc5: &gcc5 apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4', + packages: [ 'g++-5', 'gcc-5', 'libxrandr-dev', 'libxcursor-dev', 'libxinerama-dev' ] addons_qt4: &qt4 apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4', 'libjemalloc-dev', - 'mesa-utils', 'qt4-default' ] + packages: [ 'g++-5', 'gcc-5', 'libjemalloc-dev', + 'qt4-default' ] addons_qt5: &qt5 apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4', - 'mesa-utils', 'libc6-dbg', 'qt5-default', 'libqt5opengl5-dev', 'qtdeclarative5-dev', 'qtpositioning5-dev', 'qtlocation5-dev' ] + packages: [ 'g++-5', 'gcc-5', + 'libc6-dbg', 'qt5-default', 'libqt5opengl5-dev', 'qtdeclarative5-dev', 'qtpositioning5-dev', 'qtlocation5-dev' ] env: global: diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index b4bc030064..73d3f127f6 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,6 +1,6 @@ mason_use(glfw VERSION 3.2.1) if (WITH_OSMESA OR IS_CI_BUILD) - mason_use(mesa VERSION 13.0.0${MASON_MESA_SUFFIX}${MASON_CXXABI_SUFFIX}) + mason_use(mesa VERSION 13.0.0-static${MASON_MESA_SUFFIX}${MASON_CXXABI_SUFFIX}) endif() mason_use(boost_libprogram_options VERSION 1.60.0) mason_use(sqlite VERSION 3.14.2) diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh index 26e6c9b4c6..7141e6d709 100755 --- a/scripts/travis_setup.sh +++ b/scripts/travis_setup.sh @@ -72,8 +72,8 @@ if [ -f /etc/init.d/xvfb ] && [ ! -z "${RUN_XVFB}" ]; then fi # Install and set up to load a more recent version of mesa mapbox_time "install_mesa" \ - mason install mesa 13.0.0-glx${CXX11ABI} - export LD_LIBRARY_PATH="`mason prefix mesa 13.0.0-glx${CXX11ABI}`/lib:${LD_LIBRARY_PATH:-}" + mason install mesa 13.0.0-static-glx${CXX11ABI} + export LD_LIBRARY_PATH="`mason prefix mesa 13.0.0-static-glx${CXX11ABI}`/lib:${LD_LIBRARY_PATH:-}" fi # Install and set up to load awscli |