diff options
| -rwxr-xr-x | acprep | 12 | ||||
| -rw-r--r-- | lib/Makefile | 6 |
2 files changed, 9 insertions, 9 deletions
@@ -245,8 +245,8 @@ class CommandLineApp(object): force_exit = True # If true, always ends run() with sys.exit() log_handler = None darwin_gcc = False - boost_version = "1_46_1" - boost_major = "1_46_1" + boost_version = "1_47_0" + boost_major = "1_47" options = { 'debug': False, @@ -1252,7 +1252,7 @@ class PrepareBuild(CommandLineApp): home_path = '/usr/local/stow/boost_%s-%s' % \ (self.boost_version, self.boost_inc_ident), suffix = '-%s-sd-%s' % \ - (self.boost_lib_ident, self.boost_version), + (self.boost_lib_ident, self.boost_major), file_suffix = '.dylib', include_path = 'include/boost-%s' % self.boost_major): pass @@ -1260,7 +1260,7 @@ class PrepareBuild(CommandLineApp): home_path = '/usr/local/stow/boost_%s-%s' % \ (self.boost_version, self.boost_inc_ident), suffix = '-%s-d-%s' % \ - (self.boost_lib_ident, self.boost_version), + (self.boost_lib_ident, self.boost_major), file_suffix = '.dylib', include_path = 'include/boost-%s' % self.boost_major): pass @@ -1274,7 +1274,7 @@ class PrepareBuild(CommandLineApp): home_path = '/usr/local/stow/boost_%s-%s' % \ (self.boost_version, self.boost_inc_ident), suffix = '-%s-s-%s' % \ - (self.boost_lib_ident, self.boost_version), + (self.boost_lib_ident, self.boost_major), file_suffix = '.dylib', include_path = 'include/boost-%s' % self.boost_major): pass @@ -1282,7 +1282,7 @@ class PrepareBuild(CommandLineApp): home_path = '/usr/local/stow/boost_%s-%s' % \ (self.boost_version, self.boost_inc_ident), suffix = '-%s-%s' % \ - (self.boost_lib_ident, self.boost_version), + (self.boost_lib_ident, self.boost_major), file_suffix = '.dylib', include_path = 'include/boost-%s' % self.boost_major): pass diff --git a/lib/Makefile b/lib/Makefile index e2d5dd2b..734816af 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -5,8 +5,8 @@ STOW_ROOT = /usr/local/stow PRODUCTS = $(HOME)/Products -GCC_VERSION = 4.6 -BOOST_VERSION = 1_46_1 +GCC_VERSION = 4.5 +BOOST_VERSION = 1_47_0 CC = gcc-mp-$(GCC_VERSION) ifeq ($(CC),clang) @@ -51,7 +51,7 @@ all: boost-build #icu-build boost-icu-build prepare-boost: perl -i -pe 's/local command = \[ common\.get-invocation-command darwin : g\+\+ : .*/local command = [ common.get-invocation-command darwin : g++ : $(CXX) ] ;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam - perl -i -pe 's/flags darwin\.compile OPTIONS : -no-cpp-precomp -gdwarf-2 ;/flags darwin\.compile OPTIONS : -gdwarf-2 ;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam + perl -i -pe 's/flags darwin\.compile OPTIONS : -no-cpp-precomp -gdwarf-2 (-fexceptions )?;/flags darwin\.compile OPTIONS : -gdwarf-2 \1;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam boost-build: prepare-boost (cd $(BOOST_SOURCE) && \ |