diff --git a/develop/boost/boost.conf b/develop/boost/boost.conf index 41602c75e..6df011dd0 100644 --- a/develop/boost/boost.conf +++ b/develop/boost/boost.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../boost/boost.conf -# Copyright (C) 2010 The OpenSDE Project +# Copyright (C) 2010 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -13,19 +13,21 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -runconf=0 -makeopt= -makeinstopt= - -# otherwise rebuilding boost does not reinstall static files -var_insert taropt ' ' -m +configscript="./bootstrap.sh" +confopt="--prefix=/$prefix" bjamopt= var_append bjamopt ' ' "toolset=$CC" +var_append bjamopt ' ' "--prefix=/$prefix" +var_append bjamopt ' ' "--libdir=$libdir" +var_append bjamopt ' ' "--includedir=$includedir" +var_append bjamopt ' ' "--layout=system" -hook_add inmake 5 "bjam -j $SDECFG_PARALLEL_MAX $bjamopt" -hook_add postmake 5 "bjam $bjamopt --prefix=$prefix --libdir=$libdir \ - --includedir=$includedir --layout=system \ - install" +MAKE="./bjam" +makeopt="-j $SDECFG_PARALLEL_MAX $bjamopt" +makeinstopt="$bjamopt install" + +# otherwise rebuilding boost does not reinstall static files +# var_insert taropt ' ' -m unset bjamopt diff --git a/develop/boost/boost.desc b/develop/boost/boost.desc index 47ee5a23b..55f165dfa 100644 --- a/develop/boost/boost.desc +++ b/develop/boost/boost.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../boost/boost.desc -[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -38,7 +38,7 @@ [L] OpenSource [S] Stable -[V] 1_43_0 +[V] 1.46.1 [P] X -----5---9 144.600 -[D] 3112661481 boost_1_43_0.tar.bz2 http://dl.sourceforge.net/sourceforge/boost/ +[D] 2708439448 boost_1_46_1.tar.bz2 http://dl.sourceforge.net/sourceforge/boost/