From 0614f5de241c8552bce186ef5236eba3ad7299fc Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 5 Jan 2011 01:27:11 +0000 Subject: [PATCH] support for boost trunk (1.46) by enforcing boost filesystem v2 for now --- SConstruct | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 4f76f7f7c..2cb9c61e7 100644 --- a/SConstruct +++ b/SConstruct @@ -1170,7 +1170,9 @@ if not preconfigured: env.Append(CXXFLAGS = common_cxx_flags + '-O %s' % ndebug_flags) else: # Common flags for GCC. - gcc_cxx_flags = '-ansi -Wall %s -ftemplate-depth-200 %s' % (pthread, common_cxx_flags) + # note: starting with boost 1.46 boost filesystem v3 is default so force to be v2 + # by using BOOST_FILESYSTEM_VERSION=2 (until we upgrade) + gcc_cxx_flags = '-ansi -Wall %s -ftemplate-depth-200 -DBOOST_FILESYSTEM_VERSION=2 %s' % (pthread, common_cxx_flags) if env['DEBUG']: env.Append(CXXFLAGS = gcc_cxx_flags + '-O0 -fno-inline %s' % debug_flags)