summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2010-02-02 21:37:23 -0500
committerJohn Wiegley <johnw@newartisans.com>2010-02-04 04:11:51 -0500
commit7533cf7ddbd758a4c8ecb780d6eae1d38004b780 (patch)
tree988524caca96f1ca1917d4306e6a05ee120284db
parent141308597784f77414032b00f239e0601f9d4d38 (diff)
downloadfork-ledger-7533cf7ddbd758a4c8ecb780d6eae1d38004b780.tar.gz
fork-ledger-7533cf7ddbd758a4c8ecb780d6eae1d38004b780.tar.bz2
fork-ledger-7533cf7ddbd758a4c8ecb780d6eae1d38004b780.zip
FMoved up to Boost 1.42
-rwxr-xr-xacprep34
-rw-r--r--lib/Makefile2
2 files changed, 19 insertions, 17 deletions
diff --git a/acprep b/acprep
index d7f8d5ec..be85d2b5 100755
--- a/acprep
+++ b/acprep
@@ -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):
diff --git a/lib/Makefile b/lib/Makefile
index 7714f21d..f0f2b3d1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -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