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

travis: disable gdal install

Browse source
This commit is contained in:
Dane Springmeyer 2014-07-30 13:10:27 -07:00
parent 350c2c29bd
commit f5c9100ca2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -18,7 +18,9 @@ before_install:
# more recent boost # more recent boost
- sudo add-apt-repository -y ppa:boost-latest/ppa - sudo add-apt-repository -y ppa:boost-latest/ppa
- sudo apt-get update -y - sudo apt-get update -y
- sudo apt-get install -y gcc-4.8 g++-4.8 make boost1.55 libgdal-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev # gdal is borked on travis again
#- sudo apt-get install -y gcc-4.8 g++-4.8 make boost1.55 libgdal-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev
- sudo apt-get install -y gcc-4.8 g++-4.8 make boost1.55 python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev
- wget http://mapnik.s3.amazonaws.com/deps/harfbuzz-0.9.32.tar.bz2 - wget http://mapnik.s3.amazonaws.com/deps/harfbuzz-0.9.32.tar.bz2
- tar xf harfbuzz-0.9.32.tar.bz2 - tar xf harfbuzz-0.9.32.tar.bz2
- cd harfbuzz-0.9.32 - cd harfbuzz-0.9.32
@ -29,7 +31,7 @@ before_install:
install: install:
- if [[ "${CXX}" == 'g++' ]]; then export CXX="g++-4.8" && export CC="gcc-4.8"; fi; - if [[ "${CXX}" == 'g++' ]]; then export CXX="g++-4.8" && export CC="gcc-4.8"; fi;
- ./configure CXX="${CXX}" CC="${CC}" DEMO=True BENCHMARK=True CPP_TESTS=True CAIRO=True FAST=True - ./configure CXX="${CXX}" CC="${CC}" DEMO=True BENCHMARK=True CPP_TESTS=True CAIRO=True FAST=True
- if [[ "${CXX}" == 'g++-4.8' ]]; then JOBS=3 make; else JOBS=8 make; fi; - if [[ "${CXX}" == 'g++-4.8' ]]; then JOBS=3 make; else JOBS=10 make; fi;
before_script: before_script:
- make test - make test