framewave-system-boost.patch

   1 --- FRAMEWAVE_1.3.1_SRC/Framewave/domain/fwBase/fwBase.sconscript.orig  2009-07-09 11:15:36.000000000 +0200
   2 +++ FRAMEWAVE_1.3.1_SRC/Framewave/domain/fwBase/fwBase.sconscript       2013-02-20 16:19:45.120766072 +0100
   3 @@ -17,26 +17,11 @@
   4  # Setup the path to the constatnts source file\r
   5  pthConstCPP  = join(oRoot.dctFwVars['pthProjectRoot'], 'common', 'src', 'Constants.cpp')\r
   6  \r
   7 -if oRoot.dctFwVars['thread'] == 'pthread' :\r
   8 -       pthBoostBase = join(oRoot.dctFwVars['pthProjectRoot'], '..', 'sdk', 'boost_1_34_0', 'libs', 'thread', 'src')\r
   9 -       lstExtraBaseCPPs = [     pthConstCPP ,\r
  10 -               join(pthBoostBase,'barrier.cpp'),       \\r
  11 -               join(pthBoostBase,'condition.cpp'),     \\r
  12 -               join(pthBoostBase,'exceptions.cpp'),    \\r
  13 -               join(pthBoostBase,'mutex.cpp'),         \\r
  14 -               join(pthBoostBase,'once.cpp'),          \\r
  15 -               join(pthBoostBase,'thread.cpp'),        \\r
  16 -               join(pthBoostBase,'tss_dll.cpp'),       \\r
  17 -               join(pthBoostBase,'tss_hooks.cpp'),     \\r
  18 -               join(pthBoostBase,'tss_pe.cpp'),        \\r
  19 -               join(pthBoostBase,'xtime.cpp')          ]\r
  20 -else:\r
  21 -       lstExtraBaseCPPs = [ pthConstCPP ]\r
  22 +lstExtraBaseCPPs = [ pthConstCPP ]\r
  23  \r
  24  # Project script essentially starts here\r
  25 -fwBase      = fwProject(oRoot, 'fwBase')\r
  26 +fwBase      = fwProject(oRoot, 'fwBase', LIBS=['boost_thread', 'boost_system'], LIBPATH=[])\r
  27  \r
  28 -setupIncludePaths(fwBase.oEnv, join('sdk', 'boost_1_34_0'), dontRecurse=1)\r
  29  oLib_fwBase = fwBase.initBuildObjects(lstExtraCPPs=lstExtraBaseCPPs)\r
  30  \r
  31  Return("oLib_fwBase")\r
  32 --- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py.orig 2009-07-09 11:14:21.000000000 +0200
  33 +++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py      2013-02-21 19:18:21.173357164 +0100
  34 @@ -143,8 +143,6 @@
  35          setupIncludePaths(self.oEnv, join('domain',sProjectName))\r
  36          #setupIncludePaths(self.oEnv, join("domain",sProjectName,"include"))\r
  37  \r
  38 -        if ( ((sys.platform=='linux2') or (sys.platform=='sunos5')) and (self.dctFwVars['libtype']=='static') ):\r
  39 -            AddObjsFromLibs(self.oEnv, LIBS, LIBPATH)\r
  40  \r
  41          if ( sys.platform=='darwin' ):\r
  42              self.oEnv['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 'True';\r