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

skip boost check when cross compiling [skip ci]

Browse source
This commit is contained in:
Dane Springmeyer 2016-04-21 09:04:38 -07:00
parent 2a46e4517a
commit e5fafd31d1
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SConstruct
View file

@ -1451,12 +1451,13 @@ if not preconfigured:
# just turn it off like this, but seems the only available work- # just turn it off like this, but seems the only available work-
# around. See https://svn.boost.org/trac/boost/ticket/6779 for more # around. See https://svn.boost.org/trac/boost/ticket/6779 for more
# details. # details.
boost_version = [int(x) for x in env.get('BOOST_LIB_VERSION_FROM_HEADER').split('_')] if not env['HOST']:
if not conf.CheckBoostScopedEnum(): boost_version = [int(x) for x in env.get('BOOST_LIB_VERSION_FROM_HEADER').split('_')]
if boost_version < [1, 51]: if not conf.CheckBoostScopedEnum():
env.Append(CXXFLAGS = '-DBOOST_NO_SCOPED_ENUMS') if boost_version < [1, 51]:
elif boost_version < [1, 57]: env.Append(CXXFLAGS = '-DBOOST_NO_SCOPED_ENUMS')
env.Append(CXXFLAGS = '-DBOOST_NO_CXX11_SCOPED_ENUMS') elif boost_version < [1, 57]:
env.Append(CXXFLAGS = '-DBOOST_NO_CXX11_SCOPED_ENUMS')
if not env['HOST'] and env['ICU_LIB_NAME'] not in env['MISSING_DEPS']: if not env['HOST'] and env['ICU_LIB_NAME'] not in env['MISSING_DEPS']:
# http://lists.boost.org/Archives/boost/2009/03/150076.php # http://lists.boost.org/Archives/boost/2009/03/150076.php