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

Merge branch 'master' into topojson

Browse source
This commit is contained in:
artemp 2016-05-23 10:52:19 +02:00
commit f3ae60fed4
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
SConstruct
View file

@ -704,11 +704,7 @@ def FindBoost(context, prefixes, thread_flag):
BOOST_INCLUDE_DIR = None BOOST_INCLUDE_DIR = None
BOOST_APPEND = None BOOST_APPEND = None
env['BOOST_APPEND'] = str() env['BOOST_APPEND'] = str()
search_lib = 'libboost_filesystem'
if env['THREADING'] == 'multi':
search_lib = 'libboost_thread'
else:
search_lib = 'libboost_filesystem'
# note: must call normpath to strip trailing slash otherwise dirname # note: must call normpath to strip trailing slash otherwise dirname
# does not remove 'lib' and 'include' # does not remove 'lib' and 'include'
@ -1411,15 +1407,6 @@ if not preconfigured:
['program_options', 'boost/program_options.hpp', False] ['program_options', 'boost/program_options.hpp', False]
] ]
if env['THREADING'] == 'multi':
BOOST_LIBSHEADERS.append(['thread', 'boost/thread/mutex.hpp', True])
# on solaris the configure checks for boost_thread
# require the -pthreads flag to be able to check for
# threading support, so we add as a global library instead
# of attaching to cxxflags after configure
if env['PLATFORM'] == 'SunOS':
env.Append(CXXFLAGS = '-pthreads')
# if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests # if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests
if env['PRIORITIZE_LINKING']: if env['PRIORITIZE_LINKING']:
conf.prioritize_paths(silent=True) conf.prioritize_paths(silent=True)

10
bootstrap.sh
View file

@ -10,7 +10,7 @@ todo
- shrink icu data - shrink icu data
' '
MASON_VERSION="694d08c" MASON_VERSION="3e0cc5a"
function setup_mason() { function setup_mason() {
if [[ ! -d ./.mason ]]; then if [[ ! -d ./.mason ]]; then
@ -20,7 +20,6 @@ function setup_mason() {
echo "Updating to latest mason" echo "Updating to latest mason"
(cd ./.mason && git fetch && git checkout ${MASON_VERSION}) (cd ./.mason && git fetch && git checkout ${MASON_VERSION})
fi fi
export MASON_DIR=$(pwd)/.mason
export PATH=$(pwd)/.mason:$PATH export PATH=$(pwd)/.mason:$PATH
export CXX=${CXX:-clang++} export CXX=${CXX:-clang++}
export CC=${CC:-clang} export CC=${CC:-clang}
@ -63,8 +62,11 @@ function install_mason_deps() {
wait wait
install webp 0.4.2 libwebp & install webp 0.4.2 libwebp &
install gdal 1.11.2 libgdal & install gdal 1.11.2 libgdal &
install boost 1.59.0 & install boost 1.61.0 &
install boost_liball 1.59.0 & install boost_libsystem 1.61.0 &
install boost_libfilesystem 1.61.0 &
install boost_libprogram_options 1.61.0 &
install boost_libregex 1.61.0 &
install freetype 2.6 libfreetype & install freetype 2.6 libfreetype &
install harfbuzz 0.9.41 libharfbuzz & install harfbuzz 0.9.41 libharfbuzz &
wait wait