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

scons: suncc support is not maintained, remove it

Browse source
This commit is contained in:
Dane Springmeyer 2013-11-03 15:32:29 -08:00
parent 6ffd0e9bc2
commit 0f8c931530
4 changed files with 18 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -14,6 +14,8 @@ Released ...
Summary: TODO Summary: TODO
- Dropped support for Sun compiler
- Upgraded unifont to `unifont-6.3.20131020` - Upgraded unifont to `unifont-6.3.20131020`
- CSV Plugin: added the ability to pass an `extent` in options - CSV Plugin: added the ability to pass an `extent` in options

44
SConstruct
View file

@ -430,7 +430,6 @@ pickle_store = [# Scons internal variables
'BOOST_APPEND', 'BOOST_APPEND',
'LIBDIR_SCHEMA', 'LIBDIR_SCHEMA',
'REQUESTED_PLUGINS', 'REQUESTED_PLUGINS',
'SUNCC',
'PYTHON_VERSION', 'PYTHON_VERSION',
'PYTHON_INCLUDES', 'PYTHON_INCLUDES',
'PYTHON_INSTALL_LOCATION', 'PYTHON_INSTALL_LOCATION',
@ -1143,21 +1142,6 @@ if not preconfigured:
thread_suffix = '' thread_suffix = ''
env.Append(LIBS = 'pthread') env.Append(LIBS = 'pthread')
# Solaris & Sun Studio settings (the `SUNCC` flag will only be
# set if the `CXX` option begins with `CC`)
SOLARIS = env['PLATFORM'] == 'SunOS'
env['SUNCC'] = SOLARIS and env['CXX'].startswith('CC')
# If the Sun Studio C++ compiler (`CC`) is used instead of gcc.
if env['SUNCC']:
env['CC'] = 'cc'
# To be compatible w/Boost everything needs to be compiled
# with the `-library=stlport4` flag (which needs to come
# before the `-o` flag).
env['CXX'] = 'CC -library=stlport4'
if env['THREADING'] == 'multi':
env.Append(CXXFLAGS = '-mt')
if env['SHAPE_MEMORY_MAPPED_FILE']: if env['SHAPE_MEMORY_MAPPED_FILE']:
env.Append(CPPDEFINES = '-DSHAPE_MEMORY_MAPPED_FILE') env.Append(CPPDEFINES = '-DSHAPE_MEMORY_MAPPED_FILE')
@ -1734,22 +1718,22 @@ if not preconfigured:
else: else:
env.Append(CPPDEFINES = ndebug_defines) env.Append(CPPDEFINES = ndebug_defines)
if not env['SUNCC']: # Common flags for g++/clang++ CXX compiler.
# Common flags for CXX compiler. # -Wsign-conversion -Wconversion -Wunused-parameter
common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread) common_cxx_flags = '-Wall -Wsign-compare -Wshadow -Wconversion -Wno-sign-conversion %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
# https://github.com/mapnik/mapnik/issues/1835 # https://github.com/mapnik/mapnik/issues/1835
if sys.platform == 'darwin' and env['CXX'] == 'g++': if sys.platform == 'darwin' and env['CXX'] == 'g++':
common_cxx_flags += '-fpermissive ' common_cxx_flags += '-fpermissive '
if env['DEBUG']: if env['DEBUG']:
env.Append(CXXFLAGS = common_cxx_flags + '-O0 -fno-inline') env.Append(CXXFLAGS = common_cxx_flags + '-O0 -fno-inline')
else: else:
# TODO - add back -fvisibility-inlines-hidden # TODO - add back -fvisibility-inlines-hidden
# https://github.com/mapnik/mapnik/issues/1863 # https://github.com/mapnik/mapnik/issues/1863
env.Append(CXXFLAGS = common_cxx_flags + '-O%s -fno-strict-aliasing -finline-functions -Wno-inline -Wno-parentheses -Wno-char-subscripts' % (env['OPTIMIZATION'])) env.Append(CXXFLAGS = common_cxx_flags + '-O%s -fno-strict-aliasing -finline-functions -Wno-inline -Wno-parentheses -Wno-char-subscripts' % (env['OPTIMIZATION']))
if env['DEBUG_UNDEFINED']: if env['DEBUG_UNDEFINED']:
env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv') env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
if 'python' in env['BINDINGS'] or 'python' in env['REQUESTED_PLUGINS']: if 'python' in env['BINDINGS'] or 'python' in env['REQUESTED_PLUGINS']:
majver, minver = env['PYTHON_VERSION'].split('.') majver, minver = env['PYTHON_VERSION'].split('.')

5
deps/agg/build.py vendored
View file

@ -24,9 +24,6 @@ Import('env')
agg_env = env.Clone() agg_env = env.Clone()
if env['SUNCC']: cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O -KPIC -DNDEBUG'
else:
cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
agg_env.StaticLibrary('agg', glob('./src/' + '*.cpp'), LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS']) agg_env.StaticLibrary('agg', glob('./src/' + '*.cpp'), LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS'])

5
deps/clipper/build.py vendored
View file

@ -24,9 +24,6 @@ Import('env')
clipper_env = env.Clone() clipper_env = env.Clone()
if env['SUNCC']: cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O -KPIC -DNDEBUG'
else:
cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
clipper_env.StaticLibrary('clipper', ['./src/clipper.cpp',], LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS']) clipper_env.StaticLibrary('clipper', ['./src/clipper.cpp',], LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS'])