- finished system-boost patch (wrt. static libs build)

[packages/framewave.git] / framewave-system-boost.patch

diff --git a/framewave-system-boost.patch b/framewave-system-boost.patch
index 5f210b293ffae9ff39bf6d01dbd12ce8e065831a..7b94715b3a9d9b3f36809fb0fc83eb0e2387a1c3 100644 (file)
--- a/framewave-system-boost.patch
+++ b/framewave-system-boost.patch
@@ -23,9 +23,20 @@
  \r
  # Project script essentially starts here\r
 -fwBase      = fwProject(oRoot, 'fwBase')\r
-+fwBase      = fwProject(oRoot, 'fwBase', LIBS=['boost_thread', 'boost_system'])\r
++fwBase      = fwProject(oRoot, 'fwBase', LIBS=['boost_thread', 'boost_system'], LIBPATH=[])\r
  \r
 -setupIncludePaths(fwBase.oEnv, join('sdk', 'boost_1_34_0'), dontRecurse=1)\r
  oLib_fwBase = fwBase.initBuildObjects(lstExtraCPPs=lstExtraBaseCPPs)\r
  \r
  Return("oLib_fwBase")\r
+--- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py.orig        2009-07-09 11:14:21.000000000 +0200
++++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py     2013-02-21 19:18:21.173357164 +0100
+@@ -143,8 +143,6 @@
+         setupIncludePaths(self.oEnv, join('domain',sProjectName))\r
+         #setupIncludePaths(self.oEnv, join("domain",sProjectName,"include"))\r
+ \r
+-        if ( ((sys.platform=='linux2') or (sys.platform=='sunos5')) and (self.dctFwVars['libtype']=='static') ):\r
+-            AddObjsFromLibs(self.oEnv, LIBS, LIBPATH)\r
+ \r
+         if ( sys.platform=='darwin' ):\r
+             self.oEnv['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 'True';\r