From 73e23ab857af7d29be6e5c4361b8376ee6ad50b1 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 17 Oct 2007 17:15:53 +0000
Subject: [PATCH] Updates to build system: Sun and SGI compilers have a problem
 doing a shared link, and some platforms don't have an icudata library.

[SVN r40128]
---
 build/Jamfile.v2   | 25 +++++++++++++++++++------
 example/Jamfile.v2 |  8 +++++++-
 test/Jamfile.v2    | 10 +++++++++-
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 4cfaa478..68ef66e0 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -125,12 +125,24 @@ rule check-icu-config ( )
             }
             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 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
 
 
 
+
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index 022f8945..295ef904 100644
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -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 @@ test-suite regex-examples :
 
 
 
+
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index e948858e..e8d01e14 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -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 @@ test-suite regex
 
 
 
+