X-Git-Url: https://git.pld-linux.org/?p=packages%2Fframewave.git;a=blobdiff_plain;f=framewave-system-boost.patch;h=7b94715b3a9d9b3f36809fb0fc83eb0e2387a1c3;hp=5f210b293ffae9ff39bf6d01dbd12ce8e065831a;hb=refs%2Ftags%2Fauto%2Fth%2Fframewave-1.3.1-3;hpb=7a3dd3afc52de2131208c74b94aa90f46f48c85b diff --git a/framewave-system-boost.patch b/framewave-system-boost.patch index 5f210b2..7b94715 100644 --- a/framewave-system-boost.patch +++ b/framewave-system-boost.patch @@ -23,9 +23,20 @@ # Project script essentially starts here -fwBase = fwProject(oRoot, 'fwBase') -+fwBase = fwProject(oRoot, 'fwBase', LIBS=['boost_thread', 'boost_system']) ++fwBase = fwProject(oRoot, 'fwBase', LIBS=['boost_thread', 'boost_system'], LIBPATH=[]) -setupIncludePaths(fwBase.oEnv, join('sdk', 'boost_1_34_0'), dontRecurse=1) oLib_fwBase = fwBase.initBuildObjects(lstExtraCPPs=lstExtraBaseCPPs) Return("oLib_fwBase") +--- 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)) + #setupIncludePaths(self.oEnv, join("domain",sProjectName,"include")) + +- if ( ((sys.platform=='linux2') or (sys.platform=='sunos5')) and (self.dctFwVars['libtype']=='static') ): +- AddObjsFromLibs(self.oEnv, LIBS, LIBPATH) + + if ( sys.platform=='darwin' ): + self.oEnv['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 'True';