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

scons: cross compilation fixes

Browse source
This commit is contained in:
Dane Springmeyer 2015-03-04 16:25:15 -08:00
parent e69bedadff
commit d5e3dba3df
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SConstruct
View file

@ -1283,10 +1283,11 @@ if not preconfigured:
else: else:
env['MISSING_DEPS'].append('libxml2') env['MISSING_DEPS'].append('libxml2')
if conf.CheckHasDlfcn(): if not env['HOST']:
env.Append(CPPDEFINES = '-DMAPNIK_HAS_DLCFN') if conf.CheckHasDlfcn():
else: env.Append(CPPDEFINES = '-DMAPNIK_HAS_DLCFN')
env['SKIPPED_DEPS'].extend(['dlfcn']) else:
env['SKIPPED_DEPS'].extend(['dlfcn'])
OPTIONAL_LIBSHEADERS = [] OPTIONAL_LIBSHEADERS = []
@ -1340,7 +1341,7 @@ if not preconfigured:
conf.prioritize_paths(silent=True) conf.prioritize_paths(silent=True)
# test for C++11 support, which is required # test for C++11 support, which is required
if not conf.supports_cxx11(): if not env['HOST'] and not conf.supports_cxx11():
color_print(1,"C++ compiler does not support C++11 standard (-std=c++11), which is required. Please upgrade your compiler to at least g++ 4.7 (ideally 4.8)") color_print(1,"C++ compiler does not support C++11 standard (-std=c++11), which is required. Please upgrade your compiler to at least g++ 4.7 (ideally 4.8)")
Exit(1) Exit(1)

2
src/build.py
View file

@ -251,7 +251,7 @@ if env['PLUGIN_LINKING'] == 'static':
lib_env.AppendUnique(CPPPATH='../plugins/') lib_env.AppendUnique(CPPPATH='../plugins/')
for plugin in env['REQUESTED_PLUGINS']: for plugin in env['REQUESTED_PLUGINS']:
details = env['PLUGINS'][plugin] details = env['PLUGINS'][plugin]
if details['lib'] in env['LIBS'] or not details['lib']: if not details['lib'] or details['lib'] in env['LIBS']:
plugin_env = SConscript('../plugins/input/%s/build.py' % plugin) plugin_env = SConscript('../plugins/input/%s/build.py' % plugin)
if not plugin_env: if not plugin_env:
print("Notice: no 'plugin_env' variable found for plugin: '%s'" % plugin) print("Notice: no 'plugin_env' variable found for plugin: '%s'" % plugin)