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

try libstdc++-4.8-dev

Browse source
This commit is contained in:
Dane Springmeyer 2016-09-26 21:27:48 -07:00
parent 03f1e49818
commit 5226f39bd4
2 changed files with 34 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.travis.yml
View file

@ -28,20 +28,20 @@ matrix:
env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" TRIGGER=true
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test']
packages: [ 'libstdc++-5-dev', 'xutils-dev']
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libstdc++-4.8-dev', 'xutils-dev' ]
- os: linux
sudo: false
compiler: ": clang-coverage"
env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8"
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test']
packages: ['libstdc++-5-dev', 'xutils-dev' ]
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libstdc++-4.8-dev', 'xutils-dev' ]
- os: osx
compiler: ": clang-osx"
# https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
osx_image: xcode7.3 # upgrades clang from 6 -> 7
osx_image: xcode8 # upgrades clang from 6 -> 7
env: JOBS=4 MASON_PUBLISH=true CXX="ccache clang++ -Qunused-arguments"
before_install:
@ -76,13 +76,10 @@ install:
before_script:
- source bootstrap.sh
- |
if [[ $(uname -s) == 'Linux' ]]; then
mason install clang 3.8.0
export PATH=$(mason prefix clang 3.8.0)/bin:${PATH}
which clang++
export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov"
fi
- mason install clang++ 3.8.1
- export PATH=$(mason prefix clang++ 3.8.1)/bin:${PATH}
- which clang++
- export LLVM_COV="$(mason prefix clang++ 3.8.1)/bin/llvm-cov"
- ccache --version
- ccache -p || true
- ccache --show-stats || true

58
bootstrap.sh
View file

@ -11,7 +11,7 @@ todo
- shrink icu data
'
MASON_VERSION="new-pkgs"
MASON_VERSION="llvm-3.9.0-newpkgs"
function setup_mason() {
if [[ ! -d ./.mason ]]; then
@ -47,42 +47,34 @@ function install() {
ICU_VERSION="55.1"
function install_mason_deps() {
FAIL=0
install ccache 3.3.0 &
install zlib system &
install jpeg_turbo 1.5.0 libjpeg &
install libpng 1.6.24 libpng &
install libtiff 4.0.6 libtiff &
install libpq 9.5.2 &
install sqlite 3.14.1 libsqlite3 &
install expat 2.2.0 libexpat &
install icu ${ICU_VERSION} &
install proj 4.9.2 libproj &
install pixman 0.34.0 libpixman-1 &
install cairo 1.14.6 libcairo &
install protobuf 2.6.1 &
install ccache 3.3.0
install zlib system
install jpeg_turbo 1.5.0 libjpeg
install libpng 1.6.24 libpng
install libtiff 4.0.6 libtiff
install libpq 9.5.2
install sqlite 3.14.1 libsqlite3
install expat 2.2.0 libexpat
install icu ${ICU_VERSION}
install proj 4.9.2 libproj
install pixman 0.34.0 libpixman-1
install cairo 1.14.6 libcairo
install protobuf 2.6.1
# technically protobuf is not a mapnik core dep, but installing
# here by default helps make mapnik-vector-tile builds easier
install webp 0.5.1 libwebp &
install gdal 2.1.1 libgdal &
install boost 1.61.0 &
install boost_libsystem 1.61.0 &
install boost_libfilesystem 1.61.0 &
install boost_libprogram_options 1.61.0 &
install boost_libregex_icu 1.61.0 &
install webp 0.5.1 libwebp
install gdal 2.1.1 libgdal
install boost 1.61.0
install boost_libsystem 1.61.0
install boost_libfilesystem 1.61.0
install boost_libprogram_options 1.61.0
install boost_libregex_icu 1.61.0
# technically boost thread and python are not a core dep, but installing
# here by default helps make python-mapnik builds easier
install boost_libthread 1.61.0 &
install boost_libpython 1.61.0 &
install freetype 2.6.5 libfreetype &
install harfbuzz 1.3.0 libharfbuzz &
for job in $(jobs -p)
do
wait $job || let "FAIL+=1"
done
if [[ "$FAIL" != "0" ]]; then
exit ${FAIL}
fi
install boost_libthread 1.61.0
install boost_libpython 1.61.0
install freetype 2.6.5 libfreetype
install harfbuzz 1.3.0 libharfbuzz
}
MASON_LINKED_ABS=$(pwd)/mason_packages/.link