[Lunar-commits] r19804 - moonbase/trunk/libs/boost

[Chad Kittel]

Author: v3rt1g0
Date: 2006-04-23 03:37:03 +0000 (Sun, 23 Apr 2006)
New Revision: 19804

Modified:
   moonbase/trunk/libs/boost/BUILD
   moonbase/trunk/libs/boost/DEPENDS
   moonbase/trunk/libs/boost/DETAILS
Log:
  Misc Tidy: boost (1.33.1)

    * reworked the BUILD file.
       - I'm no longer mass installing any header files, if this poses
         a problem, I can add them back, however, I compiled everything
         in the moonbase that depends on boost without an issue.
    * made Python optional
    * other misc formatting tweaks


Modified: moonbase/trunk/libs/boost/BUILD
===================================================================
--- moonbase/trunk/libs/boost/BUILD	2006-04-23 03:30:30 UTC (rev 19803)
+++ moonbase/trunk/libs/boost/BUILD	2006-04-23 03:37:03 UTC (rev 19804)
@@ -1,34 +1,37 @@
 (
-   # get python version
-   PYTHON_VERSION="`installed_version Python`"
 
-   bjam         $OPTS                             \
-     		-sBOOST_ROOT=$SOURCE_DIRECTORY    \
-		-sPYTHON_ROOT=/usr                \
-		-sPYTHON_VERSION=$PYTHON_VERSION &&
+  # build bjam (which is used instead of make)
+  cd  "$SOURCE_DIRECTORY/tools/build/jam_src"  &&
+  ./build.sh gcc  &&
+  cd  "$SOURCE_DIRECTORY"
 
-   prepare_install  &&
-   
-   # install libs
-   find bin/boost/libs -type f -name "*.a" \
-	-exec install -m644 {} /usr/lib \; &&
-   find bin/boost/libs -type f -name "*.so*" \
-        -exec install -m755 {} /usr/lib \;
+  BJAMBIN="$SOURCE_DIRECTORY/tools/build/jam_src/bin.*/bjam"
 
-   # make proper link
-   vp="1_33_1"
-   for x in `find /usr/lib -type f -name "libboost*.so.$VERSION"`; do
-     # get basename
-     bn=${x%%so*}
-     # make link
-     ln -sf $x ${bn}so
-     ln -sf ${bn}so ${bn/-gcc-$vp/}so
-     ln -sf ${bn}a ${bn/-gcc-$vp/}a
-   done
+  $BJAMBIN  -sBOOST_ROOT="$SOURCE_DIRECTORY"  \
+            -sTOOLS=gcc                       \
+            --prefix=/usr                     \
+            --layout=system                   \
+            $OPTS
 
-   # install source/header files
-   find boost -type f \
-	-exec install -D -m0644 {} /usr/include/{} \;
+  $BJAMBIN  -sBOOST_ROOT="$SOURCE_DIRECTORY"  \
+            -sTOOLS=gcc                       \
+            --prefix=/usr                     \
+            --layout=system                   \
+            $OPTS
 
-   # need to add doc from doxygen ?
+  prepare_install  &&
+
+  cd  "$SOURCE_DIRECTORY/tools/build"                &&
+  mkdir -p /usr/share/boost-build                    &&
+  cp -pPR index.html v1/ v2/ /usr/share/boost-build  &&
+
+  cd  "$SOURCE_DIRECTORY"
+
+  $BJAMBIN  -sBOOST_ROOT="$SOURCE_DIRECTORY"  \
+            -sTOOLS=gcc                       \
+            --prefix=/usr                     \
+            --layout=system                   \
+            $OPTS                             \
+            install
+
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/libs/boost/DEPENDS
===================================================================
--- moonbase/trunk/libs/boost/DEPENDS	2006-04-23 03:30:30 UTC (rev 19803)
+++ moonbase/trunk/libs/boost/DEPENDS	2006-04-23 03:37:03 UTC (rev 19804)
@@ -1,2 +1,4 @@
 depends  boost-jam  &&
-depends  Python
+
+optional_depends  "Python"  ""  "--without-python"  \
+                  "to build the Boost Python bindings"

Modified: moonbase/trunk/libs/boost/DETAILS
===================================================================
--- moonbase/trunk/libs/boost/DETAILS	2006-04-23 03:30:30 UTC (rev 19803)
+++ moonbase/trunk/libs/boost/DETAILS	2006-04-23 03:37:03 UTC (rev 19804)
@@ -7,14 +7,12 @@
         WEB_SITE=http://www.boost.org
          ENTERED=20041115
          UPDATED=20060225
-        SHORT="A cross-platform supplement to the C++ standard library"
+           SHORT="a cross-platform supplement to the C++ standard library"
 
-
 cat << EOF
 Boost is a cross-platform supplement to the C++ standard library. It
 provides many things, among them 
  - help for non-compliant implementations of the standard library
  - additional containers, iterators, and smart-pointer types
  - help for templates
- - ...
 EOF