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

scons: allow for boost lib symlinks without dashes, and search on libboost_thread if building with multi threading support (to accomodate potentially limited thread lib names on gentoo)

Browse source
This commit is contained in:
Dane Springmeyer 2009-08-04 15:56:21 +00:00
parent 16f4efc07b
commit a5174cd3c1
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SConstruct
View file

@ -365,18 +365,23 @@ def FindBoost(context, prefixes):
BOOST_APPEND = None BOOST_APPEND = None
env['BOOST_APPEND'] = str() env['BOOST_APPEND'] = str()
if env['THREADING'] == 'multi':
search_lib = 'libboost_thread'
else:
search_lib = 'libboost_filesystem'
prefixes.insert(0,os.path.dirname(env['BOOST_INCLUDES'])) prefixes.insert(0,os.path.dirname(env['BOOST_INCLUDES']))
prefixes.insert(0,os.path.dirname(env['BOOST_LIBS'])) prefixes.insert(0,os.path.dirname(env['BOOST_LIBS']))
for searchDir in prefixes: for searchDir in prefixes:
libItems = glob(os.path.join(searchDir, LIBDIR_SCHEMA, 'libboost_filesystem*-*.*')) libItems = glob(os.path.join(searchDir, LIBDIR_SCHEMA, '%s*.*' % search_lib))
if not libItems: if not libItems:
libItems = glob(os.path.join(searchDir, 'lib/libboost_filesystem*-*.*')) libItems = glob(os.path.join(searchDir, 'lib/%s*.*' % search_lib))
incItems = glob(os.path.join(searchDir, 'include/boost*/')) incItems = glob(os.path.join(searchDir, 'include/boost*/'))
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/')
shortest_lib_name = shortest_name(libItems) shortest_lib_name = shortest_name(libItems)
match = re.search(r'libboost_filesystem-(.*)\..*', shortest_lib_name) match = re.search(r'%s(.*)\..*' % search_lib, shortest_lib_name)
if hasattr(match,'groups'): if hasattr(match,'groups'):
BOOST_APPEND = match.groups()[0] BOOST_APPEND = match.groups()[0]
break break
@ -400,7 +405,7 @@ def FindBoost(context, prefixes):
if not env['BOOST_TOOLKIT'] and not env['BOOST_ABI'] and not env['BOOST_VERSION']: if not env['BOOST_TOOLKIT'] and not env['BOOST_ABI'] and not env['BOOST_VERSION']:
if BOOST_APPEND: if BOOST_APPEND:
msg += '\n *lib naming extension found: %s' % BOOST_APPEND msg += '\n *lib naming extension found: %s' % BOOST_APPEND
env['BOOST_APPEND'] = '-' + BOOST_APPEND env['BOOST_APPEND'] = BOOST_APPEND
else: else:
msg += '\n *no lib naming extension found' msg += '\n *no lib naming extension found'
else: else: