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

Merge pull request #3806 from mapnik/3.0.x-fix-glibcxx

Browse source 
3.0.x fix glibcxx symbols
This commit is contained in:
Artem Pavlenko 2017-11-28 16:18:41 +01:00 committed by GitHub
commit 237d3b0714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -33,7 +33,7 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang" compiler: ": clang"
env: JOBS=8 CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" ENABLE_GLIBC_WORKAROUND=True TRIGGER=true env: JOBS=8 CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" ENABLE_GLIBC_WORKAROUND=true TRIGGER=true
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
@ -95,7 +95,7 @@ before_script:
script: script:
- export SCONSFLAGS='--debug=time' - export SCONSFLAGS='--debug=time'
- configure BENCHMARK=${BENCH} ENABLE_GLIBC_WORKAROUND=${ENABLE_GLIBC_WORKAROUND:-False} - configure BENCHMARK=${BENCH} ENABLE_GLIBC_WORKAROUND=${ENABLE_GLIBC_WORKAROUND:-false}
- cat config.log - cat config.log
# we limit the `make` to 40 min # we limit the `make` to 40 min
# to ensure that slow builds still upload their # to ensure that slow builds still upload their

17
bootstrap.sh
View file

@ -11,7 +11,7 @@ todo
- shrink icu data - shrink icu data
' '
MASON_VERSION="v0.11.1" MASON_VERSION="v0.17.0"
function setup_mason() { function setup_mason() {
if [[ ! -d ./.mason ]]; then if [[ ! -d ./.mason ]]; then
@ -45,6 +45,7 @@ function install() {
} }
ICU_VERSION="57.1" ICU_VERSION="57.1"
BOOST_VERSION="1.65.1"
function install_mason_deps() { function install_mason_deps() {
install ccache 3.3.1 install ccache 3.3.1
@ -64,15 +65,15 @@ function install_mason_deps() {
# here by default helps make mapnik-vector-tile builds easier # here by default helps make mapnik-vector-tile builds easier
install webp 0.6.0 libwebp install webp 0.6.0 libwebp
install libgdal 2.1.3 libgdal install libgdal 2.1.3 libgdal
install boost 1.63.0 install boost ${BOOST_VERSION}
install boost_libsystem 1.63.0 install boost_libsystem ${BOOST_VERSION}
install boost_libfilesystem 1.63.0 install boost_libfilesystem ${BOOST_VERSION}
install boost_libprogram_options 1.63.0 install boost_libprogram_options ${BOOST_VERSION}
install boost_libregex_icu57 1.63.0 install boost_libregex_icu57 ${BOOST_VERSION}
# technically boost thread and python are not a core dep, but installing # technically boost thread and python are not a core dep, but installing
# here by default helps make python-mapnik builds easier # here by default helps make python-mapnik builds easier
install boost_libthread 1.63.0 install boost_libthread ${BOOST_VERSION}
install boost_libpython 1.63.0 install boost_libpython ${BOOST_VERSION}
install freetype 2.7.1 libfreetype install freetype 2.7.1 libfreetype
install harfbuzz 1.4.4-ft libharfbuzz install harfbuzz 1.4.4-ft libharfbuzz
} }