From ec3bf9d04628bc2812cc8ccdc21d12d5abc536f2 Mon Sep 17 00:00:00 2001
From: cconverse711 <cconverse711@gmail.com>
Date: Fri, 16 Dec 2016 22:59:31 -0500
Subject: [PATCH] Fix boost library naming conventions

---
 waflib/extras/boost.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/waflib/extras/boost.py b/waflib/extras/boost.py
index 1cae78a2..98af58eb 100644
--- a/waflib/extras/boost.py
+++ b/waflib/extras/boost.py
@@ -129,7 +129,7 @@ def options(opt):
 				   default=False, dest='boost_mt',
 				   help='select multi-threaded libraries')
 	opt.add_option('--boost-abi', type='string', default='', dest='boost_abi',
-				   help='''select libraries with tags (gd for debug, static is automatically added),
+				   help='''select libraries with tags (s for static runtime, gd for debug, sgd for both),
 				   see doc Boost, Getting Started, chapter 6.1''')
 	opt.add_option('--boost-linkage_autodetect', action="store_true", dest='boost_linkage_autodetect',
 				   help="auto-detect boost linkage options (don't get used to it / might break other stuff)")
@@ -270,9 +270,7 @@ def boost_get_libs(self, *k, **kw):
 		if kw.get('mt', False):
 			t.append('-mt')
 		if kw.get('abi'):
-			t.append('%s%s' % (is_static and '-s' or '-', kw['abi']))
-		elif is_static:
-			t.append('-s')
+			t.append('-%s' % kw['abi'])
 		tags_pat = t and ''.join(t) or ''
 		ext = is_static and self.env.cxxstlib_PATTERN or self.env.cxxshlib_PATTERN
 		ext = ext.partition('%s')[2] # remove '%s' or 'lib%s' from PATTERN
@@ -285,14 +283,16 @@ def boost_get_libs(self, *k, **kw):
 				tags = '({0})?((-py{2})|(-py{1}(?=[^0-9]))|({2})|(-{1}.{3})|({1}(?=[^0-9]))|(?=[^0-9])(?!-py))'.format(tags_pat, kw['python'][0], kw['python'], kw['python'][1])
 			else:
 				tags = tags_pat
+
 			# Trying libraries, from most strict match to least one
-			for pattern in ['boost_%s%s%s%s%s$' % (lib, toolset_pat, tags, version, ext),
-							'boost_%s%s%s%s$' % (lib, tags, version, ext),
+			prefix = (not Utils.is_win32 or is_static) and 'lib' or ''
+			for pattern in ['%sboost_%s%s%s%s%s$' % (prefix, lib, toolset_pat, tags, version, ext),
+							'%sboost_%s%s%s%s$' % (prefix, lib, tags, version, ext),
 							# Give up trying to find the right version
-							'boost_%s%s%s%s$' % (lib, toolset_pat, tags, ext),
-							'boost_%s%s%s$' % (lib, tags, ext),
-							'boost_%s%s$' % (lib, ext),
-							'boost_%s' % lib]:
+							'%sboost_%s%s%s%s$' % (prefix, lib, toolset_pat, tags, ext),
+							'%sboost_%s%s%s$' % (prefix, lib, tags, ext),
+							'%sboost_%s%s$' % (prefix, lib, ext),
+							'%sboost_%s' % (prefix, lib)]:
 				self.to_log('Trying pattern %s' % pattern)
 				file = find_lib(re.compile(pattern), files)
 				if file:
@@ -367,8 +367,8 @@ def check_boost(self, *k, **kw):
 
 		def is_log_mt():
 			'''Check if found boost_log library is multithread-safe'''
-			for lib in libs:
-				if lib.startswith('boost_log'):
+			for lib in libs + stlibs:
+				if 'boost_log' in lib:
 					lib_log = lib
 					break
 			return '-mt' in lib_log