sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FMoved up to Boost 1.42

Browse source
This commit is contained in:
John Wiegley 2010-02-02 21:37:23 -05:00
parent 1413085977
commit 7533cf7ddb
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
acprep
View file

@ -36,8 +36,8 @@ LEVELS = {'DEBUG': logging.DEBUG,
'ERROR': logging.ERROR,
'CRITICAL': logging.CRITICAL}
search_prefixes = [ '/usr/local',
'/opt/local',
search_prefixes = [ '/opt/local',
'/usr/local',
'/sw',
'/usr' ]
@ -164,7 +164,8 @@ class BoostInfo(object):
sys.exit(1)
if not self.check_for_boost_regex_hpp(path):
self.log.warning("Could not find Boost header 'boost/regex.hpp'; use --boost-* flags")
self.log.error("Could not find Boost header 'boost/regex.hpp' in '%s'; use --boost-* flags" % path)
sys.exit(1)
return path
@ -182,7 +183,8 @@ class BoostInfo(object):
sys.exit(1)
if not self.check_for_boost_regex_lib(path, self.suffix):
self.log.warning("Could not find Boost library 'boost_regex'; use --boost-* flags")
self.log.error("Could not find Boost library 'boost_regex' in '%s'; use --boost-* flags" % path)
sys.exit(1)
return path
@ -1117,13 +1119,13 @@ class PrepareBuild(CommandLineApp):
self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags')
self.CPPFLAGS.append('-D_GLIBCXX_DEBUG=1')
if self.boost_info.configure(home_path = '/usr/local/stow/boost_1_41_0',
suffix = '-xgcc44-sd-1_41',
include_path = 'include/boost-1_41'):
if self.boost_info.configure(home_path = '/usr/local/stow/boost_1_42_0',
suffix = '-xgcc44-sd-1_42',
include_path = 'include/boost-1_42'):
pass
elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_41_0',
suffix = '-xgcc44-d-1_41',
include_path = 'include/boost-1_41'):
elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_42_0',
suffix = '-xgcc44-d-1_42',
include_path = 'include/boost-1_42'):
pass
elif self.boost_info.configure(suffix = '-d'):
pass
@ -1131,13 +1133,13 @@ class PrepareBuild(CommandLineApp):
else:
if self.boost_info.configure():
pass
elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_41_0',
suffix = '-xgcc44-s-1_41',
include_path = 'include/boost-1_41'):
elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_42_0',
suffix = '-xgcc44-s-1_42',
include_path = 'include/boost-1_42'):
pass
elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_41_0',
suffix = '-xgcc44-1_41',
include_path = 'include/boost-1_41'):
elif self.boost_info.configure(home_path = '/usr/local/stow/boost_1_42_0',
suffix = '-xgcc44-1_42',
include_path = 'include/boost-1_42'):
pass
def setup_flavor_default(self):

2
lib/Makefile
View file

@ -12,7 +12,7 @@ CPPFLAGS = -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1
CFLAGS = $(CPPFLAGS) -g
LDFLAGS = -g
BOOST_VERSION = 1_41_0
BOOST_VERSION = 1_42_0
BOOST_SOURCE = boost_$(BOOST_VERSION)
BOOST_TOOLSET = darwin
BOOST_DEFINES = define=_GLIBCXX_DEBUG=1 define=_GLIBCXX_FULLY_DYNAMIC_STRING=1