sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try 3.9 and check for GLIBCXX symbols >= 3.4.20

Browse source
This commit is contained in:
Dane Springmeyer 2016-10-11 00:52:03 -04:00
parent 321fd54b00
commit f1cf081e4c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.travis.yml
View file

@ -25,7 +25,7 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang" compiler: ": clang"
env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" TRIGGER=true env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test' ] sources: [ 'ubuntu-toolchain-r-test' ]
@ -33,7 +33,7 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang-coverage" compiler: ": clang-coverage"
env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9"
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test' ] sources: [ 'ubuntu-toolchain-r-test' ]
@ -76,10 +76,10 @@ install:
before_script: before_script:
- source bootstrap.sh - source bootstrap.sh
- mason install clang++ 3.8.1 - mason install clang++ 3.9.0
- export PATH=$(mason prefix clang++ 3.8.1)/bin:${PATH} - export PATH=$(mason prefix clang++ 3.9.0)/bin:${PATH}
- which clang++ - which clang++
- export LLVM_COV="$(mason prefix clang++ 3.8.1)/bin/llvm-cov" - export LLVM_COV="$(mason prefix clang++ 3.9.0)/bin/llvm-cov"
- ccache --version - ccache --version
- ccache -p || true - ccache -p || true
- ccache --show-stats || true - ccache --show-stats || true
@ -95,6 +95,7 @@ script:
# (and might work) for the next build # (and might work) for the next build
- DURATION=2400 - DURATION=2400
- scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make
- nm src/libmapnik.* | grep "GLIBCXX_3.4.2[0-9]" | c++filt
- make test - make test
- enabled ${COVERAGE} coverage - enabled ${COVERAGE} coverage
- enabled ${BENCH} make bench - enabled ${BENCH} make bench