Fix spurious warnings and workaround possible aliasing porblems (-fno-strict-aliasing)

[senf.git] / site_scons / senfutil.py

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index 5468463..246f72e 100644 (file)
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -1,5 +1,6 @@
 import os.path, glob, site_tools.Yaptu
 from SCons.Script import *
+import senfconf
 
 senfutildir = os.path.dirname(__file__)
 
@@ -66,7 +67,8 @@ Special command line parameters:
 # This looks much more complicated than it is: We do three things here:
 # a) switch between final or debug options
 # b) parse the LOGLEVELS parameter into the correct SENF_LOG_CONF syntax
-# c) check for a local SENF, set options accordingly and update that SENF if needed
+# c) check for a local SENF, set options accordingly
+# d) check, wether the boost extensions are needed
 
 def SetupForSENF(env, senf_path = []):
     global senfutildir
@@ -75,15 +77,9 @@ def SetupForSENF(env, senf_path = []):
     loadTools(env)
 
     env.Append(
-        LIBS              = [ 'senf', 'rt', '$BOOSTREGEXLIB',
-                              '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB',
-                              '$BOOSTFSLIB' ],
-        BOOSTREGEXLIB     = 'boost_regex',
-        BOOSTIOSTREAMSLIB = 'boost_iostreams',
-        BOOSTSIGNALSLIB   = 'boost_signals',
-        BOOSTFSLIB        = 'boost_filesystem',
+        LIBS              = [ 'rt' ],
         
-        CXXFLAGS          = [ '-Wno-long-long', '$CXXFLAGS_' ],
+        CXXFLAGS          = [ '-Wno-long-long', '$CXXFLAGS_', '-fno-strict-aliasing' ],
         CXXFLAGS_         = BuildTypeOptions('CXXFLAGS'),
         
         CPPDEFINES        = [ '$expandLogOption', '$CPPDEFINES_' ],
@@ -160,20 +156,30 @@ def SetupForSENF(env, senf_path = []):
         if not env.GetOption('no_progress'):
             print "\nSENF library not found .. trying build anyway !!\n"
 
+    Configure(env)
+
+    # Only add senf after all configure checks have run
+    env.Append(
+        CPPPATH = '${NEED_BOOST_EXT and "$SENFDIR/boost_ext" or None}',
+        LIBS = [ 'senf', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB',
+                 '$BOOSTFSLIB' ],
+        )
+
     env.Alias('all', '#')
 
 
 def DefaultOptions(env):
     env.Append(
         CXXFLAGS         = [ '-Wall', '-Woverloaded-virtual' ],
-        CXXFLAGS_final   = [ '-O2' ],
-        CXXFLAGS_normal  = [ '-O0', '-g' ],
-        CXXFLAGS_debug   = [ '$CXXFLAGS_normal' ],
+        CXXFLAGS_final   = [ '-O3' ],
+        CXXFLAGS_normal  = [ '-O2', '-g' ],
+        CXXFLAGS_debug   = [ '-O0', '-g' ],
 
         LINKFLAGS_normal = [ '-Wl,-S' ],
         LINKFLAGS_debug  = [ '-g' ],
     )
 
+
 def Glob(env, exclude=[], subdirs=[]):
     testSources = env.Glob("*.test.cc", strings=True)
     sources = [ x 
@@ -188,6 +194,17 @@ def Glob(env, exclude=[], subdirs=[]):
     testSources.sort()
     return (sources, testSources)
 
+
+def Configure(env):
+    conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests())
+    env.Replace(
+        BOOST_VERSION  =  conf.CheckBoostVersion(),
+        BOOST_VARIANT  = conf.CheckBoostVariants( '', 'mt' ),
+        NEED_BOOST_EXT = not conf.CheckCXXHeader("boost/bimap.hpp"),
+    )
+    conf.Finish()
+
+
 tagfiles = None
 
 def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=False, senfdoc_path=[],
@@ -262,7 +279,8 @@ def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=Fals
                                      'tagfiles'   : '$TAGFILES',
                                      'output_dir' : 'doc',
                                      'html_dir'   : 'html',
-                                     'html'       : 'YES' },
+                                     'html'       : 'YES',
+                                     'DOXYGEN'    : '$DOXYGEN' },
                       TAGFILES   = tagfiles, 
                       DOCLIBDIR  = libdir,
                       DOXYGENCOM = "$DOCLIBDIR/doxygen.sh $DOXYOPTS $SOURCE")