[Lunar-commits] <moonbase> boost: Some more twiddling here. ElAngelo noted the optimization causes the make

[Dennis `stumbles` Veatch]

commit 35eaf713c3a24e7775e82cc4cf32d77b549bcdbe
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Aug 14 08:42:51 2009 -0400

    boost: Some more twiddling here. ElAngelo noted the optimization causes the make
    
    to barf with gcc44, since we will be moving to that soon (?) just removing it
    for now.
    
    The icu4c now works properlly when you say no to the optional_depends.
---
 libs/boost/BUILD   |   14 ++------------
 libs/boost/DEPENDS |    2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index 5fd9958..602f358 100644
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -6,14 +6,8 @@
   export EXPAT_INCLUDE=/usr/include/
   export EXPAT_LIBPATH=/usr/lib/
 
-  if in_depends $MODULE icu4c ; then
-    HAVE_ICU="1"
-  else
-    HAVE_ICU="0"
-  fi &&
-
   bjam -q ${MAKES:+-j$MAKES} \
-       threading=single,multi \
+       threading=multi \
        --layout=tagged    \
        runtime-link=shared \
        link=shared \
@@ -21,8 +15,6 @@
        debug-symbols=off \
        --prefix=/usr \
        --toolset=gcc \
-       optimization=speed \
-       -sHAVE_ICU=$HAVE_ICU \
        --includedir="/usr/include" \
        --libdir="/usr/lib" \
        $OPTS &&
@@ -30,7 +22,7 @@
   prepare_install &&
 
   bjam -q ${MAKES:+-j$MAKES} \
-       threading=single,multi \
+       threading=multi \
        --layout=tagged    \
        runtime-link=shared \
        link=shared \
@@ -40,8 +32,6 @@
        --prefix=/usr \
        --includedir="/usr/include" \
        --libdir="/usr/lib" \
-       -sHAVE_ICU=$HAVE_ICU  \
-       optimization=speed \
        $OPTS \
        install
 
diff --git a/libs/boost/DEPENDS b/libs/boost/DEPENDS
index d7272ae..4d79c0a 100644
--- a/libs/boost/DEPENDS
+++ b/libs/boost/DEPENDS
@@ -3,4 +3,4 @@ depends  boost-jam
 optional_depends "Python"  ""  "--without-python"  \
                  "to build the Boost Python bindings"
 
-optional_depends "icu4c" "" "" "to enable unicode support"
+optional_depends "icu4c" "-sHAVE_ICU=1" "" "to enable unicode support"