[Lunar-commits] <moonbase> boost: A few adjustments here. Adding --without-mpi becasue I was getting

[Dennis `stumbles` Veatch]

commit e7dd8cbcad118071cd3dfd0edc212d5c09c85499
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Aug 13 20:46:34 2009 -0400

    boost: A few adjustments here. Adding --without-mpi becasue I was getting
    
    tired of seeing that warning. The EXPAT exports, so it would shut up about
    GrpahML. It seems the -sHAVE_ICU=1 was not working when called from the DEPENDS.
    Removing it and adding the if/thens to the BUILD fixes that.
---
 libs/boost/BUILD   |   18 ++++++++++++++++--
 libs/boost/DEPENDS |    5 +----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index 75d964c..2e5ba8c 100644
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -2,6 +2,16 @@
 
   patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
+  OPTS="--without-mpi"
+  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=multi \
        runtime-link=shared \
@@ -9,8 +19,10 @@
        release \
        debug-symbols=off \
        --prefix=/usr \
-       --layout=system \
+       --layout=tagged \
        --toolset=gcc \
+       optimization=speed \
+       -sHAVE_ICU=$HAVE_ICU \
        $OPTS &&
 
   prepare_install &&
@@ -25,7 +37,9 @@
        --prefix=/usr \
        --includedir="/usr/include" \
        --libdir="/usr/lib" \
-       --layout=system \
+       --layout=tagged \
+       -sHAVE_ICU=$HAVE_ICU  \
+       optimization=speed \
        $OPTS \
        install
 
diff --git a/libs/boost/DEPENDS b/libs/boost/DEPENDS
index 5ce7e21..d7272ae 100644
--- a/libs/boost/DEPENDS
+++ b/libs/boost/DEPENDS
@@ -3,7 +3,4 @@ depends  boost-jam
 optional_depends "Python"  ""  "--without-python"  \
                  "to build the Boost Python bindings"
 
-optional_depends "icu4c" \
-                 "-sHAVE_ICU=1 -sICU_PATH=/usr" \
-                 "" \
-                 "to enable unicode support"
+optional_depends "icu4c" "" "" "to enable unicode support"