[SM-Commit] GIT changes to master grimoire by Florian Franzmann (1c00d98cfecce08b86b2168f5ff4971d3cd0c723)

Florian Franzmann scm at sourcemage.org
Wed Apr 18 13:23:45 EDT 2012


GIT changes to master grimoire by Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>:

 libs/boost/BUILD     |    4 +-
 libs/boost/CONFIGURE |   85 ++-------------------------------------------------
 libs/boost/HISTORY   |    3 +
 3 files changed, 9 insertions(+), 83 deletions(-)

New commits:
commit 1c00d98cfecce08b86b2168f5ff4971d3cd0c723
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    libs/boost: fixed selectable libraries, fixed bug #385

diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index ebf504d..ddb1dc5 100755
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -3,10 +3,10 @@
 #
 CXXFLAGS="-Wno-strict-aliasing $CXXFLAGS" &&
 
-local BOOST_LIBS="${BOOST_LIBS_AL} ${BOOST_LIBS_MZ}" &&
+local BOOST_LIBS="${BOOST_LIBS_AL#none} ${BOOST_LIBS_MZ#none}" &&
 local BLIST=""                                    &&
 local BL                                          &&
-if [[ $BOOST_SELECT_LIBS == "n" ]]; then
+if [[ $BOOST_SELECT_LIBS == "n" ]] || [[ $BOOST_LIBS == " " ]]; then
   BLIST=""
 else
   local SEP=" --with-"                            &&
diff --git a/libs/boost/CONFIGURE b/libs/boost/CONFIGURE
index c7f5466..c97e254 100755
--- a/libs/boost/CONFIGURE
+++ b/libs/boost/CONFIGURE
@@ -2,107 +2,30 @@
 config_query BOOST_SELECT_LIBS "Select individual boost libraries to build?" n &&
 if [[ "${BOOST_SELECT_LIBS}" == "y" ]]; then
 config_query_multi BOOST_LIBS_AL "Which boost libraries would you like to install?" \
-                              accumulators \
-                              any \
-                              array \
-                              asio \
-                              assign \
-                              bimap \
-                              bind \
-                              call_traits \
+                              none \
                               chrono \
-                              circular_buffer \
-                              compressed_pair \
-                              concept_check \
-                              container \
-                              conversion \
-                              crc \
                               date_time \
-                              dynamic_bitset \
                               exception \
-                              enable_if \
                               filesystem \
-                              flyweight \
-                              foreach \
-                              format \
-                              function \
-                              function_types \
-                              functional \
-                              fusion \
-                              gil \
-                              geometry \
                               graph \
                               graph_parallel \
-                              heap \
-                              icl \
-                              io \
                               iostreams \
-                              integer \
-                              interprocess \
-                              interval \
-                              intrusive \
-                              iostreams \
-                              iterators \
-                              lambda \
-                              locale \
-                              lexical_cast &&
+                              locale &&
 config_query_multi BOOST_LIBS_MZ "Which additional boost libraries would you like to install?"   \
+                              none \
                               math \
-                              mem_fn \
-                              minmax \
-                              move \
                               mpi \
-                              mpl \
-                              multi_array \
-                              multi_index \
-                              numeric \
-                              operators \
-                              optional \
-                              parameter \
-                              phoenix \
-                              polygon \
-                              pool \
-                              preprocessor \
                               program_options \
-                              property_map \
-                              property_tree \
-                              proto \
                               python \
                               random \
-                              range \
-                              ratio \
-                              rational \
-                              ref \
                               regex \
-                              result_of \
-                              scope_exit \
                               serialization \
                               signals \
-                              signals2 \
-                              smart_ptr \
-                              statechart \
-                              static_assert \
-                              spirit \
-                              string_algo \
-                              swap \
                               system \
                               test \
                               thread \
                               timer \
-                              tokenizer \
-                              tr1 \
-                              tribool \
-                              tuple \
-                              type_traits \
-                              typeof \
-                              units \
-                              unordered \
-                              utility \
-                              value_initialized \
-                              uuid \
-                              variant \
-                              wave \
-                              xpressive
+                              wave
 fi &&
 config_query_list BOOST_VARIANT "What variant of boost do you want?"         \
                                  release debug                               &&
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index b3357ff..8c29dfa 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,6 @@
+2012-04-18 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+  * DEPENDS, BUILD: fixed selectable libraries, this fixes bug #385
+
 2012-04-08 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* BUILD, CONFIGURE, DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS,
 	  SUB_DEPENDS: split selectable libraries into two variables, added missing libraries


More information about the SM-Commit mailing list