Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21348/tools/build/v2/tools
Modified Files:
Tag: RC_1_34_0
stlport.jam
Log Message:
Work around STLport link requirements when linking static vs. multi thread
modes. (merge from head)
Index: stlport.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/stlport.jam,v
retrieving revision 1.17.8.7
retrieving revision 1.17.8.8
diff -u -d -r1.17.8.7 -r1.17.8.8
--- stlport.jam 20 Jun 2006 21:33:01 -0000 1.17.8.7
+++ stlport.jam 27 Jun 2006 14:18:21 -0000 1.17.8.8
@@ -89,20 +89,6 @@
self.libraries = $(libraries) ;
self.version = $(version) ;
self.version.5 = [ MATCH "^(5[.][0123456789]+).*" : $(version) ] ;
-
- local requirements ;
- requirements += <stdlib-stlport:version>$(self.version) ;
- if $(self.version.5)
- {
- # For STLport 5.x multi-threading is required.
- #~ requirements += <threading>multi ;
-
- #~ Doesn't currently work as the matching fallback takes over
- #~ and matches a build without stlport when threading-multi is not
- #~ specified. Question stands as to wether single-thread code
- #~ can use the multi-thread STLport.
- }
- self.requirements = [ property-set.create $(requirements) ] ;
}
rule generate ( property-set )
@@ -246,6 +232,19 @@
<define>_STLP_NO_OWN_IOSTREAMS=1
<define>_STLP_HAS_NO_NEW_IOSTREAMS=1 ;
}
+ if $(self.version.5)
+ {
+ # Version 5.x
+ if [ $(rproperties).get <threading> ] = "single"
+ {
+ # Since STLport5 doesn't normally support single-thread
+ # we force STLport5 into the multi-thread mode. Hence
+ # getting what other libs provide of single-thread code
+ # linking against a multi-thread lib.
+ usage-requirements +=
+ <define>_STLP_THREADS=1 ;
+ }
+ }
#~ Allow setting up to use STLport by only using the library target
#~ /stlport//stlport.
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
