sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (f98febcd8a4fefba882c89cee1f0c61ec1fe724c)
- From: Andraž 'ruskie' Levstik <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (f98febcd8a4fefba882c89cee1f0c61ec1fe724c)
- Date: Thu, 1 May 2008 15:36:58 -0500
GIT changes to master grimoire by Andraž 'ruskie' Levstik
<ruskie AT codemages.net>:
libs/boost/BUILD | 23 +++++++++++++++++------
libs/boost/CONFIGURE | 8 ++++----
libs/boost/DEPENDS | 8 +++++++-
libs/boost/HISTORY | 8 ++++++++
libs/boost/INSTALL | 17 ++++++++++-------
libs/boost/PRE_SUB_DEPENDS | 3 +++
libs/boost/SUB_DEPENDS | 3 +++
7 files changed, 52 insertions(+), 18 deletions(-)
New commits:
commit f98febcd8a4fefba882c89cee1f0c61ec1fe724c
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
boost: new options, different build proccess, improved install(now
installs also a non -mt
diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index 1379acb..5c1dd94 100755
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -9,15 +9,26 @@ else
BLIST="${BLIST}${SEP}${BL}"
done
fi &&
-#if ! list_find "$BOOST_LIBS" "python" &&
-# ! list_find "$BOOST_OPTS1" "python" ; then
-# BLIST="$BLIST --without-python"
-#fi
+if list_find "${BOOST_LIBS}" "graph" ||
+ list_find "${BOOST_LIBS}" "all" ; then
+ local EXPAT_INCLUDE=/usr/lib
+ local EXPAT_LIBPATH=/usr/include
+fi
+if list_find "${BOOST_LIBS}" "mpi" ||
+ list_find "${BOOST_LIBS}" "all" ; then
+ echo "using mpi ;" > tools/build/v2/user-config.jam
+fi &&
OPTS="$OPTS $BLIST" &&
+echo $OPTS
CXXFLAGS="$CXXFLAGS" \
+EXPAT_INCLUDE=$EXPAT_INCLUDE \
+EXPAT_LIBPATH=$EXPAT_LIBPATH \
bjam -q \
+ ${BOOST_VARIANT} \
+ runtime-link=shared \
+ link=shared \
--prefix=${INSTALL_ROOT}/usr \
- -sTOOLS=gcc \
- "-sBUILD=${BOOST_VARIANT## }" \
+ --toolset=gcc \
+ threading=single,multi \
--layout=system \
$OPTS
diff --git a/libs/boost/CONFIGURE b/libs/boost/CONFIGURE
index 9a9a08a..9bccc59 100755
--- a/libs/boost/CONFIGURE
+++ b/libs/boost/CONFIGURE
@@ -1,10 +1,10 @@
. $GRIMOIRE/config_query_multi.function
&&
config_query_multi BOOST_LIBS "Which libraries would you like to install?"
\
all regex signals serialization thread
\
- python filesystem
\
- wave date_time iostreams test
\
+ python filesystem function_types
\
+ wave date_time iostreams test mpi
\
foreach statechart tr1 typeof xpressive
\
- program_options graph
&&
-config_query_multi BOOST_VARIANT "What variant of boost do you want?"
\
+ program_options graph system
&&
+config_query_list BOOST_VARIANT "What variant of boost do you want?"
\
release debug
diff --git a/libs/boost/DEPENDS b/libs/boost/DEPENDS
index 4c45f7f..fec1024 100755
--- a/libs/boost/DEPENDS
+++ b/libs/boost/DEPENDS
@@ -1,9 +1,15 @@
depends g++ &&
depends boost-jam &&
-if list_find "$BOOST_LIBS" "python"
+if list_find "$BOOST_LIBS" "python" ||
+ list_find "$BOOST_LIBS" "all"
then
depends python
fi &&
+if list_find "$BOOST_LIBS" "graph" ||
+ list_find "$BOOST_LIBS" "all"
+then
+ depends expat
+fi &&
optional_depends icu \
"-sHAVE_ICU=1" \
"" \
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 2cadd88..bc30fe0 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,11 @@
+2008-05-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: updated build procedure
+ * INSTALL: updated build procedure
+ * DEPENDS: added python and expat
+ * CONFIGURE: added some new options
+ * PRE_SUB_DEPENDS: added some new options
+ * SUB_DEPENDS: added some new options
+
2008-04-24 Elisamuel Resto <ryuji AT sourcemage.org>
* PRE_BUILD, boost-1_35_0-serialization_gcc43_64bit.patch: added, the
combination
x86_64 + boost-1_35_0 + gcc-4.3 breaks compiling of boost. Applied
in upstream scm.
diff --git a/libs/boost/INSTALL b/libs/boost/INSTALL
index 459c2b0..8060414 100755
--- a/libs/boost/INSTALL
+++ b/libs/boost/INSTALL
@@ -1,8 +1,11 @@
-CXXFLAGS="$CXXFLAGS" \
-bjam -q \
- --prefix=${INSTALL_ROOT}/usr \
- -sTOOLS=gcc \
- "-sBUILD=${BOOST_VARIANT## }" \
- --layout=system \
- $OPTS \
+bjam -q \
+ ${BOOST_VARIANT} \
+ runtime-link=shared \
+ link=shared \
+ --prefix=${INSTALL_ROOT}/usr \
+ --toolset=gcc \
+ threading=single,multi \
+ --layout=system \
+ $OPTS \
install
+
diff --git a/libs/boost/PRE_SUB_DEPENDS b/libs/boost/PRE_SUB_DEPENDS
index 50287e7..171cb97 100755
--- a/libs/boost/PRE_SUB_DEPENDS
+++ b/libs/boost/PRE_SUB_DEPENDS
@@ -4,6 +4,7 @@ fi &&
case $THIS_SUB_DEPENDS in
PROGRAM_OPTIONS) list_find "$BOOST_LIBS" program_options ;;
+ FUNCTION_TYPES) list_find "$BOOST_LIBS" function_types ;;
SERIALIZATION) list_find "$BOOST_LIBS" serialization ;;
FILESYSTEM) list_find "$BOOST_LIBS" filesystem ;;
STATECHART) list_find "$BOOST_LIBS" statechart ;;
@@ -13,12 +14,14 @@ case $THIS_SUB_DEPENDS in
FOREACH) list_find "$BOOST_LIBS" foreach ;;
SIGNALS) list_find "$BOOST_LIBS" signals ;;
PYTHON) is_depends_enabled $SPELL python ;;
+ SYSTEM) list_find "$BOOST_LIBS" system ;;
THREAD) list_find "$BOOST_LIBS" thread ;;
TYPEOF) list_find "$BOOST_LIBS" typeof ;;
GRAPH) list_find "$BOOST_LIBS" graph ;;
REGEX) list_find "$BOOST_LIBS" regex ;;
TEST) list_find "$BOOST_LIBS" test ;;
WAVE) list_find "$BOOST_LIBS" wave ;;
+ MPI) list_find "$BOOST_LIBS" mpi ;;
TR1) list_find "$BOOST_LIBS" tr1 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
diff --git a/libs/boost/SUB_DEPENDS b/libs/boost/SUB_DEPENDS
index deac9ca..097db7f 100755
--- a/libs/boost/SUB_DEPENDS
+++ b/libs/boost/SUB_DEPENDS
@@ -1,6 +1,7 @@
persistent_add BOOST_OPTS1
case $THIS_SUB_DEPENDS in
PROGRAM_OPTIONS) list_add BOOST_OPTS1 program_options ;;
+ FUNCTION_TYPES) list_add BOOST_OPTS1 function_types ;;
SERIALIZATION) list_add BOOST_OPTS1 serialization ;;
FILESYSTEM) list_add BOOST_OPTS1 filesystem ;;
STATECHART) list_add BOOST_OPTS1 statechart ;;
@@ -10,12 +11,14 @@ case $THIS_SUB_DEPENDS in
SIGNALS) list_add BOOST_OPTS1 signals ;;
PYTHON) list_add BOOST_OPTS1 python &&
depends python ;;
+ SYSTEM) list_add BOOST_OPTS1 system ;;
THREAD) list_add BOOST_OPTS1 thread ;;
TYPEOF) list_add BOOST_OPTS1 typeof ;;
GRAPH) list_add BOOST_OPTS1 graph ;;
REGEX) list_add BOOST_OPTS1 regex ;;
TEST) list_add BOOST_OPTS1 test ;;
WAVE) list_add BOOST_OPTS1 wave ;;
+ MPI) list_add BOOST_OPTS1 mpi ;;
TR1) list_add BOOST_OPTS1 tr1 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
- [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (f98febcd8a4fefba882c89cee1f0c61ec1fe724c), Andraž 'ruskie' Levstik, 05/01/2008
Archive powered by MHonArc 2.6.24.