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

increment ABI versions

Browse source
This commit is contained in:
Dane Springmeyer 2010-01-11 18:53:50 +00:00
parent f87790cd5b
commit e5673e239b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -871,7 +871,7 @@ if not preconfigured:
# fetch the mapnik version header in order to set the # fetch the mapnik version header in order to set the
# ABI version used to build libmapnik.so on linux in src/SConscript # ABI version used to build libmapnik.so on linux in src/SConscript
abi = conf.GetMapnikLibVersion() abi = conf.GetMapnikLibVersion()
abi_fallback = [0,6,1] abi_fallback = [0,8,0]
if not abi: if not abi:
color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback) color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback)
env['ABI_VERSION'] = abi_fallback env['ABI_VERSION'] = abi_fallback

2
src/SConscript
View file

@ -64,7 +64,7 @@ if env['PLATFORM'] == 'Darwin':
else: else:
lib_path = 'libmapnik.dylib' lib_path = 'libmapnik.dylib'
linkflags = '-Wl,-install_name,%s' % lib_path linkflags = '-Wl,-install_name,%s' % lib_path
linkflags += ' -current_version 0.6.1 -compatibility_version 0.6.1' linkflags += ' -current_version 0.8.0 -compatibility_version 0.8.0'
elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'): elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
linkflags = '-R. -h libmapnik.so' linkflags = '-R. -h libmapnik.so'
else: # Linux and others else: # Linux and others