[Boost-commit] svn:boost r39645 - trunk/tools/build/v2/tools

From: ghost_at_[hidden]
Date: 2007-10-01 14:44:45

Author: vladimir_prus
Date: 2007-10-01 14:44:44 EDT (Mon, 01 Oct 2007)
New Revision: 39645
URL: http://svn.boost.org/trac/boost/changeset/39645

Log:
STLPort improvements:
        - Add _static in library name as necessary
        - Define _STLP_USE_DYNAMIC_LIB depending
        on <runtime-link>, not <runtime-debugging>

Patch from David Deakins.
Addresses #1177.

Text files modified: 
   trunk/tools/build/v2/tools/stlport.jam |    12 +++++++++---                            
   1 files changed, 9 insertions(+), 3 deletions(-)

Modified: trunk/tools/build/v2/tools/stlport.jam
==============================================================================
--- trunk/tools/build/v2/tools/stlport.jam	(original)
+++ trunk/tools/build/v2/tools/stlport.jam	2007-10-01 14:44:44 EDT (Mon, 01 Oct 2007)
@@ -10,7 +10,7 @@
 # The subfeature value 'hostios' means to use host compiler's iostreams.
 #
 # The specific version of stlport is selected by features:
-# The <link> feature selects between static and shared library
+# The <runtime-link> feature selects between static and shared library
 # The <runtime-debugging>on selects STLPort with debug symbols
 # and stl debugging.
 # There's no way to use STLPort with debug symbols but without
@@ -124,7 +124,7 @@
             # STLport host IO streams no longer supported. So we always 
             # need libraries.
             
-            # name: stlport(stl)?[dg]?.M.R
+            # name: stlport(stl)?[dg]?(_static)?.M.R
             local name = stlport ;
             if [ feature.get-values <runtime-debugging> : $(raw) ] = "on"
             {
@@ -136,6 +136,12 @@
                     case * : name += d ;
                 }
             }
+
+            if [ feature.get-values <runtime-link> : $(raw) ] = "static"
+            {
+                name += _static ;
+            }
+
             name += .$(self.version.5) ;
             name = $(name:J=) ;
             
@@ -217,7 +223,7 @@
                 <define>_STLP_DEBUG=1
                 <define>_STLP_DEBUG_UNINITIALIZED=1 ;
         }
-        if [ $(rproperties).get <runtime-debugging> ] = "on"
+        if [ $(rproperties).get <runtime-link> ] = "shared"
         {
             usage-requirements +=
                 <define>_STLP_USE_DYNAMIC_LIB=1 ;