[packages/framewave] - finished system-boost patch (wrt. static libs build)
qboosh
qboosh at pld-linux.org
Thu Feb 21 20:29:15 CET 2013
commit 20b8923d156d3574949f41c07a57866f6ad43129
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Feb 21 20:29:25 2013 +0100
- finished system-boost patch (wrt. static libs build)
framewave-system-boost.patch | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
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';
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/framewave.git/commitdiff/20b8923d156d3574949f41c07a57866f6ad43129
More information about the pld-cvs-commit
mailing list