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

remove option to link againt external AGG - our local copy has critical fixes and is required

Browse source
This commit is contained in:
Dane Springmeyer 2012-05-24 17:05:51 -07:00
parent 43d6de7fa6
commit 09426bf324
3 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SConstruct
View file

@ -323,8 +323,6 @@ opts.AddVariables(
BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'), BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'),
BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),
BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'), BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'),
# Variables for optional dependencies # Variables for optional dependencies
@ -1244,15 +1242,10 @@ if not preconfigured:
env['SKIPPED_DEPS'].append('pgsql2sqlite_rtree') env['SKIPPED_DEPS'].append('pgsql2sqlite_rtree')
env['PGSQL2SQLITE'] = False env['PGSQL2SQLITE'] = False
# Decide which libagg to use # we rely on an internal, patched copy of agg with critical fixes
# if we are using internal agg, then prepend to make sure # prepend to make sure we link locally
# we link locally
if env['INTERNAL_LIBAGG']:
env.Prepend(CPPPATH = '#deps/agg/include') env.Prepend(CPPPATH = '#deps/agg/include')
env.Prepend(LIBPATH = '#deps/agg') env.Prepend(LIBPATH = '#deps/agg')
else:
env.ParseConfig('pkg-config --libs --cflags libagg')
if env['CAIRO']: if env['CAIRO']:
if env['CAIRO_LIBS'] or env['CAIRO_INCLUDES']: if env['CAIRO_LIBS'] or env['CAIRO_INCLUDES']:
@ -1677,7 +1670,7 @@ if not HELP_REQUESTED:
SetOption("num_jobs", env['JOBS']) SetOption("num_jobs", env['JOBS'])
# Build agg first, doesn't need anything special # Build agg first, doesn't need anything special
if env['RUNTIME_LINK'] == 'shared' and env['INTERNAL_LIBAGG']: if env['RUNTIME_LINK'] == 'shared':
SConscript('deps/agg/build.py') SConscript('deps/agg/build.py')
# Build the core library # Build the core library

3
src/build.py
View file

@ -75,10 +75,7 @@ if env['RUNTIME_LINK'] == 'static':
lib_env['LIBS'].append('icudata') lib_env['LIBS'].append('icudata')
lib_env['LIBS'].append('icui18n') lib_env['LIBS'].append('icui18n')
else: else:
if env['INTERNAL_LIBAGG']:
lib_env['LIBS'].insert(0, 'agg') lib_env['LIBS'].insert(0, 'agg')
else:
lib_env['LIBS'].append([lib for lib in env['LIBS'] if lib.startswith('agg')])
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
mapnik_libname = env.subst(env['MAPNIK_LIB_NAME']) mapnik_libname = env.subst(env['MAPNIK_LIB_NAME'])

4
utils/mapnik-config/build.py
View file

@ -56,8 +56,8 @@ ldflags = config_env['CUSTOM_LDFLAGS'] + ''.join([' -L%s' % i for i in config_en
dep_libs = ''.join([' -l%s' % i for i in env['LIBMAPNIK_LIBS']]) dep_libs = ''.join([' -l%s' % i for i in env['LIBMAPNIK_LIBS']])
if env['INTERNAL_LIBAGG']: # remove local agg from public linking
dep_libs = dep_libs.replace('-lagg','') dep_libs = dep_libs.replace('-lagg','')
git_revision = os.popen("git rev-list --max-count=1 HEAD").read() git_revision = os.popen("git rev-list --max-count=1 HEAD").read()