attempt to repair postgres install
This commit is contained in:
parent
58d9520c34
commit
ed568fcc2a
1 changed files with 5 additions and 7 deletions
12
.travis.yml
12
.travis.yml
|
@ -9,21 +9,17 @@ env:
|
|||
- DEBUG=True ENABLE_LOG=True DEFAULT_LOG_SEVERITY=debug XMLPARSER="libxml2" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS=""
|
||||
- DEBUG=False ENABLE_LOG=False DEFAULT_LOG_SEVERITY=none XMLPARSER="ptree" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS=""
|
||||
|
||||
addons:
|
||||
postgresql: "9.3"
|
||||
|
||||
before_install:
|
||||
- nproc
|
||||
- free
|
||||
# we need at least g++-4.7 for c++11 features
|
||||
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||
# grab more recent gdal/proj
|
||||
# breaks due to http://trac.osgeo.org/ubuntugis/ticket/39
|
||||
#- sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
|
||||
- sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
|
||||
# more recent boost
|
||||
- sudo add-apt-repository -y ppa:boost-latest/ppa
|
||||
- sudo apt-get update -y
|
||||
- sudo apt-get install -y ttf-wqy-microhei libstdc++6 libstdc++-4.8-dev make boost1.55 libgdal-dev libgdal1-dev libgdal1h=1.10.0-1~precise1 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 ttf-wqy-microhei postgis postgresql-9.1-postgis-2.0-scripts libstdc++6 libstdc++-4.8-dev make boost1.55 libgdal-dev libgdal1-dev libgdal1h=1.10.0-1~precise1 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
|
||||
- if [[ "${CXX}" == 'g++' ]]; then sudo apt-get install gcc-4.8 g++-4.8; export CXX="$(which g++-4.8)"; export CC="$(which gcc-4.8)"; fi;
|
||||
- if [[ "${CXX}" == 'clang++' ]]; then export CXX="$(which clang++)"; export CC="$(which clang)"; fi;
|
||||
- wget http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.34.tar.bz2
|
||||
|
@ -33,10 +29,12 @@ before_install:
|
|||
- cd ../
|
||||
|
||||
install:
|
||||
- ./configure CXX="${CXX}" CC="${CC}" CUSTOM_CXXFLAGS="${CUSTOM_CXXFLAGS}" CUSTOM_LDFLAGS="${CUSTOM_LDFLAGS}" XML_PARSER=${XML_PARSER} ENABLE_LOG=${ENABLE_LOG} DEBUG=${DEBUG} DEMO=${DEMO} BENCHMARK=${BENCHMARK} CPP_TESTS=True CAIRO=True FAST=True || cat config.log
|
||||
- ./configure CXX="${CXX}" CC="${CC}" CUSTOM_CXXFLAGS="${CUSTOM_CXXFLAGS}" CUSTOM_LDFLAGS="${CUSTOM_LDFLAGS}" XML_PARSER="${XML_PARSER}" ENABLE_LOG="${ENABLE_LOG}" DEBUG="${DEBUG}" DEMO="${DEMO}" BENCHMARK="${BENCHMARK}" CPP_TESTS=True CAIRO=True FAST=True || cat config.log
|
||||
- if [[ "${CXX}" == 'g++-4.8' ]]; then JOBS=2 make; else JOBS=4 make; fi;
|
||||
|
||||
before_script:
|
||||
- createdb -EUTF8 template_postgis
|
||||
- psql -c 'create extension postgis' template_postgis
|
||||
- make test
|
||||
|
||||
script:
|
||||
|
|
Loading…
Reference in a new issue