tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[linux] No need for CXXABI suffix for mesa

Browse Source
This commit is contained in:
John Firebaugh
2017-01-16 18:19:54 -08:00
parent 6658268115
commit df2b6cfec1
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/travis_setup.sh
View File

@@ -56,14 +56,10 @@ function mapbox_start_xvfb {
export -f mapbox_start_xvfb
function mapbox_export_mesa_library_path {
CXX11ABI=""
if [ `scripts/check-cxx11abi.sh` = 'ON' ]; then
CXX11ABI="-cxx11abi"
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-glx
export LD_LIBRARY_PATH="`mason prefix mesa 13.0.0-glx`/lib:${LD_LIBRARY_PATH:-}"
}
export -f mapbox_export_mesa_library_path