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

backport solaris fixes for python runpaths and pthreads from trunk

Browse source
This commit is contained in:
Dane Springmeyer 2010-10-12 05:26:08 +00:00
parent 503da430dc
commit f1caa3bbd4
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -1009,6 +1009,8 @@ if not preconfigured:
# but will retain logic for future use # but will retain logic for future use
#if platform.mac_ver()[0].startswith('10.5'): #if platform.mac_ver()[0].startswith('10.5'):
# common_cxx_flags += '-DOSX_LEOPARD ' # common_cxx_flags += '-DOSX_LEOPARD '
elif env['PLATFORM'] == 'SunOS':
pthread = '-pthreads'
else: else:
pthread = '-pthread' pthread = '-pthread'

23
bindings/python/SConscript
View file

@ -42,6 +42,16 @@ if env['BOOST_PYTHON_LIB']:
else: else:
libraries.append('boost_python%s' % env['BOOST_APPEND']) libraries.append('boost_python%s' % env['BOOST_APPEND'])
# set up an understanding of where libmapnik is being installed
# so that the python module can locate it at runtime
# and so that we can add its runpath to _mapnik.so if needed (e.g. solaris)
# Note: we use prefix rather than install_prefix here since install_prefix is for package building
# and we intend for python to look to the standard prefix location to find the fonts and plugins
mapnik_lib_path = os.path.normpath(prefix + '/' + env['LIBDIR_SCHEMA'])
mapnik_lib_dir_path = os.path.normpath(prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'])
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append(env['ICU_LIB_NAME']) libraries.append(env['ICU_LIB_NAME'])
libraries.append('boost_regex%s' % env['BOOST_APPEND']) libraries.append('boost_regex%s' % env['BOOST_APPEND'])
@ -92,6 +102,10 @@ if env['PLATFORM'] == 'Darwin':
# if we are not linking to a framework then use the *nix standard approach # if we are not linking to a framework then use the *nix standard approach
else: else:
linkflags = '-lpython%s' % env['PYTHON_VERSION'] linkflags = '-lpython%s' % env['PYTHON_VERSION']
elif env['PLATFORM'] == 'SunOS':
# make sure to explicitly link mapnik.so against
# libmapnik in its installed location
linkflags = '-R%s' % mapnik_lib_path
@ -111,16 +125,9 @@ else:
paths += "fontscollectionpath = os.path.normpath(mapniklibpath + '/fonts')" paths += "fontscollectionpath = os.path.normpath(mapniklibpath + '/fonts')"
# write out the location of the 'mapniklibpath' into a python file
# so that the python module can locate it at runtime
exp = r"%s{2,}" % os.sep
# Note: we use prefix rather than install_prefix here since install_prefix is for package building
# and we intend for python to look to the standard prefix location to find the fonts and plugins
mapnik_lib_path = re.sub(exp,os.sep, prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'])
if not os.path.exists('mapnik'): if not os.path.exists('mapnik'):
os.mkdir('mapnik') os.mkdir('mapnik')
file('mapnik/paths.py','w').write(paths % (mapnik_lib_path)) file('mapnik/paths.py','w').write(paths % (mapnik_lib_dir_path))
try: try:
os.chmod('mapnik/paths.py',0666) os.chmod('mapnik/paths.py',0666)