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

scons: when auto-finding boost libraries take the shortest boost library name found to avoid problems with variable extension naming on linux (TODO add better regex approach)

Browse source
This commit is contained in:
Dane Springmeyer 2009-07-08 21:08:13 +00:00
parent 5d193947ae
commit 28e7b5bf14
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -61,6 +61,13 @@ def call(cmd):
else: else:
color_print(1,'Problem encounted with SCons scripts, please post bug report to: http://trac.mapnik.org\nError was: %s' % stderr) color_print(1,'Problem encounted with SCons scripts, please post bug report to: http://trac.mapnik.org\nError was: %s' % stderr)
def shortest_name(libs):
name = '-'*200
for lib in libs:
if len(name) > len(lib):
name = lib
return name
if platform.uname()[4] == 'x86_64': if platform.uname()[4] == 'x86_64':
LIBDIR_SCHEMA='lib64' LIBDIR_SCHEMA='lib64'
elif platform.uname()[4] == 'ppc64': elif platform.uname()[4] == 'ppc64':
@ -374,7 +381,8 @@ def FindBoost(context, prefixes):
if len(libItems) >= 1 and len(incItems) >= 1: if len(libItems) >= 1 and len(incItems) >= 1:
BOOST_LIB_DIR = os.path.dirname(libItems[0]) BOOST_LIB_DIR = os.path.dirname(libItems[0])
BOOST_INCLUDE_DIR = incItems[0].rstrip('boost/') BOOST_INCLUDE_DIR = incItems[0].rstrip('boost/')
match = re.search(r'libboost_filesystem-(.*)\..*', libItems[0]) shortest_lib_name = shortest_name(libItems)
match = re.search(r'libboost_filesystem-(.*)\..*', shortest_lib_name)
if hasattr(match,'groups'): if hasattr(match,'groups'):
BOOST_APPEND = match.groups()[0] BOOST_APPEND = match.groups()[0]
break break