diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-11-26 19:04:51 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-11-26 19:04:51 -0500 |
| commit | 9bdb384df7b399b2ddb670e8b24fa1279312cd18 (patch) | |
| tree | bfb0e5b47ac5d8cd0b88cd19afb0cbbd0680e0fc | |
| parent | 8626409678483f529653adeaedfa7b7a4e797ebb (diff) | |
| download | fork-ledger-9bdb384df7b399b2ddb670e8b24fa1279312cd18.tar.gz fork-ledger-9bdb384df7b399b2ddb670e8b24fa1279312cd18.tar.bz2 fork-ledger-9bdb384df7b399b2ddb670e8b24fa1279312cd18.zip | |
Update to Boost 1.45
| -rwxr-xr-x | acprep | 2 | ||||
| -rw-r--r-- | lib/Makefile | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -237,7 +237,7 @@ class CommandLineApp(object): force_exit = True # If true, always ends run() with sys.exit() log_handler = None darwin_gcc = False - boost_version = "1_44" + boost_version = "1_45" options = { 'debug': False, diff --git a/lib/Makefile b/lib/Makefile index f2a8cd14..01a51717 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -10,10 +10,12 @@ ifeq ($(CC),clang) CXX = clang++ LD = llvm-ld DIR_SUFFIX = clang +OPTJ = else CXX = g++-mp-4.5 LD = gcc-mp-4.5 DIR_SUFFIX = gcc45 +OPTJ = #-j16 endif CPPFLAGS = -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 ifneq ($(CC),clang) @@ -22,7 +24,7 @@ endif CFLAGS = $(CPPFLAGS) -g LDFLAGS = -g -BOOST_VERSION = 1_44_0 +BOOST_VERSION = 1_45_0 BOOST_SOURCE = boost_$(BOOST_VERSION) BOOST_DEFINES = define=_GLIBCXX_FULLY_DYNAMIC_STRING=1 ifeq ($(CC),clang) @@ -47,7 +49,8 @@ all: boost-build cppunit-build #icu-build boost-icu-build boost-build: (cd $(BOOST_SOURCE) && \ - bjam debug --prefix=$(BOOST_STOW) --build-dir=$(BOOST_BUILD) \ + sh bootstrap.sh && \ + ./bjam $(OPTJ) debug --prefix=$(BOOST_STOW) --build-dir=$(BOOST_BUILD) \ $(BOOST_FLAGS) install) cppunit-build: |