From: tho Date: Tue, 1 Dec 2009 08:44:42 +0000 (+0000) Subject: scons: added BOOST_VARIANT workaround for karmic X-Git-Url: http://g0dil.de/git?p=senf.git;a=commitdiff_plain;h=085f7d287e2906cc48d9c602bf8f707de1102dc7 scons: added BOOST_VARIANT workaround for karmic git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1537 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/SConstruct b/SConstruct index 3b0099c..045c091 100644 --- a/SConstruct +++ b/SConstruct @@ -133,6 +133,11 @@ env.SetDefault( FLAVOR = '', ) +# ugly hack for ubuntu karmic +# ToDo: auto-configure alike support +if os.path.exists('/usr/lib/libboost_regex-mt.so'): + env.Append( BOOST_VARIANT = '-mt' ) + # Set variables from command line senfutil.parseArguments( env, diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py index 2c88b64..275ea1d 100644 --- a/site_scons/senfutil.py +++ b/site_scons/senfutil.py @@ -169,6 +169,11 @@ def DefaultOptions(env): LINKFLAGS_normal = [ '-Wl,-S' ], LINKFLAGS_debug = [ '-g' ], ) + # ugly hack for ubuntu karmic + # ToDo: auto-configure alike support + if os.path.exists('/usr/lib/libboost_regex-mt.so'): + env.Append( BOOST_VARIANT = '-mt' ) + def Glob(env, exclude=[], subdirs=[]): testSources = env.Glob("*.test.cc", strings=True)