[Boost-commit] svn:boost r40128 - in trunk/libs/regex: build example test

From: john_at_[hidden]
Date: 2007-10-17 13:15:53

Author: johnmaddock
Date: 2007-10-17 13:15:53 EDT (Wed, 17 Oct 2007)
New Revision: 40128
URL: http://svn.boost.org/trac/boost/changeset/40128

Log:
Updates to build system: Sun and SGI compilers have a problem doing a shared link, and some platforms don't have an icudata library.
Text files modified: 
   trunk/libs/regex/build/Jamfile.v2   |    25 +++++++++++++++++++------               
   trunk/libs/regex/example/Jamfile.v2 |     8 +++++++-                                
   trunk/libs/regex/test/Jamfile.v2    |    10 +++++++++-                              
   3 files changed, 35 insertions(+), 8 deletions(-)

Modified: trunk/libs/regex/build/Jamfile.v2
==============================================================================
--- trunk/libs/regex/build/Jamfile.v2	(original)
+++ trunk/libs/regex/build/Jamfile.v2	2007-10-17 13:15:53 EDT (Wed, 17 Oct 2007)
@@ -125,12 +125,24 @@
             }
             else
             {
-               ECHO WARNING: ICU shared data library not found in path. ;
-               ECHO HINT:    If the regex library fails to link then try again ;
-               ECHO          with the environment variable ICU_LINK set to contain ;
-               ECHO          the linker options required to link to ICU. ;
-               ECHO          Defaulting to look for libicudata ... ;
-               gICU_DATA_LIB = icudata ;
+               local os = [ modules.peek : OS ] ;
+               echo $(os) ;
+               if $(os) != "DARWIN"
+               {
+                  ECHO WARNING: ICU shared data library not found in path. ;
+                  ECHO HINT:    If the regex library fails to link then try again ;
+                  ECHO          with the environment variable ICU_LINK set to contain ;
+                  ECHO          the linker options required to link to ICU. ;
+               }
+               else
+               {
+                  ECHO WARNING: ICU shared data library not found in path. ;
+                  ECHO HINT:    If the regex library fails to link then try again ;
+                  ECHO          with the environment variable ICU_LINK set to contain ;
+                  ECHO          the linker options required to link to ICU. ;
+                  ECHO          Defaulting to look for libicudata ... ;
+                  gICU_DATA_LIB = icudata ;
+               }
             }
 #End of addition by Tommy Nordgren
          }
@@ -243,3 +255,4 @@
 
 
 
+

Modified: trunk/libs/regex/example/Jamfile.v2
==============================================================================
--- trunk/libs/regex/example/Jamfile.v2	(original)
+++ trunk/libs/regex/example/Jamfile.v2	2007-10-17 13:15:53 EDT (Wed, 17 Oct 2007)
@@ -4,7 +4,12 @@
 # http://www.boost.org/LICENSE_1_0.txt.
 
 project
-    : requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+    : requirements 
+      <threading>multi 
+      <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+      # There are unidentified linker problems on these platforms:
+      <toolset>mipspro-7.4:<link>static
+      <toolset>sun-5.9:<link>static
     ;
 
 
@@ -65,3 +70,4 @@
 
 
 
+

Modified: trunk/libs/regex/test/Jamfile.v2
==============================================================================
--- trunk/libs/regex/test/Jamfile.v2	(original)
+++ trunk/libs/regex/test/Jamfile.v2	2007-10-17 13:15:53 EDT (Wed, 17 Oct 2007)
@@ -4,7 +4,14 @@
 # http://www.boost.org/LICENSE_1_0.txt.
 
 project
-    : requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1 <toolset>msvc-7.1:<define>TEST_MFC=1 <toolset>msvc-7.0:<define>TEST_MFC=1
+    : requirements 
+      <threading>multi 
+      <link>shared:<define>BOOST_REGEX_DYN_LINK=1 
+      <toolset>msvc-7.1:<define>TEST_MFC=1 
+      <toolset>msvc-7.0:<define>TEST_MFC=1
+      # There are unidentified linker problems on these platforms:
+      <toolset>mipspro-7.4:<link>static
+      <toolset>sun-5.9:<link>static
     ;
 
 #
@@ -136,3 +143,4 @@
 
 
 
+