increment ABI version numbers
This commit is contained in:
parent
867799a88c
commit
817720e1c5
2 changed files with 2 additions and 2 deletions
|
@ -817,7 +817,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,0]
|
abi_fallback = [0,6,1]
|
||||||
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
|
||||||
|
|
|
@ -62,7 +62,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.0 -compatibility_version 0.6.0'
|
linkflags += ' -current_version 0.6.1 -compatibility_version 0.6.1'
|
||||||
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
|
||||||
|
|
Loading…
Add table
Reference in a new issue