# # # rename "boost" # to "Attic/boost" # # patch "INSTALL" # from [80a888d53227929e3820ac6d788fce811d177fc7] # to [2b166ffd4276883e3e75a3b8b6dbdef334b3900a] # # patch "Makefile.am" # from [24a49b6a2886c1adcfbf6ecda1183626cce5d15b] # to [9f40743ffbeb4e789d9d1157fa1b01ef44362ec5] # # patch "NEWS" # from [06211c5e27366e09cc7f24e9b7bd9ea9de5b0c92] # to [01c46c99d642728f798661004fc57a4ded91d254] # # patch "m4/boost.m4" # from [f8acc6b6b0859c9ffc31e5e7a37502bc8345176c] # to [516d3302392e728c13e58e3b432933bbae00ac21] # ============================================================ --- INSTALL 80a888d53227929e3820ac6d788fce811d177fc7 +++ INSTALL 2b166ffd4276883e3e75a3b8b6dbdef334b3900a @@ -16,7 +16,7 @@ 1. prerequisites: - automake. - gettext. - a supported C++ compiler: g++ 3.2 or later. - - boost 1.33.0 or later: either an installed copy or an extracted + - boost 1.35.0 or later: either an installed copy or an extracted tarball of its unbuilt sources somewhere in the file system are supported. - zlib 1.1.4 or later. @@ -31,11 +31,12 @@ 1. prerequisites: on debian and ubuntu: install the following packages: - autoconf automake gettext g++ libboost-dev libz-dev + autoconf automake gettext g++ libboost1.35-dev libz-dev libbotan1.8-dev libsqlite3-dev libpcre3-dev liblua5.1-0-dev libidn11-dev texinfo - (On etch, you may need to use libbotan1.8 from lenny.) + (On etch, you may need to use libbotan1.8 and + libboost1.35-dev from lenny.) on freebsd: @@ -50,7 +51,7 @@ 1. prerequisites: zlib (you might need to add the "~x86" flag to dev-libs/botan, so you - get at least version 1.6.3, we recommend using at 1.8.0 or newer) + get at least version 1.6.3, we recommend using 1.8.0 or newer) on fedora: @@ -101,7 +102,7 @@ 1. prerequisites: automake | 1.9.5 | http://prdownloads.sf.net/mingw/automake-1.9.5-mingwPORT.tar.bz2?download zlib | 1.2.3 | http://prdownloads.sf.net/mingw/zlib-1.2.3-mingwPORT.tar.bz2?download gettext | 0.16.1 | ftp://aeneas.mit.edu/pub/gnu/gettext/gettext-0.16.1.tar.gz - boost | 1.34.1 | http://prdownloads.sf.net/boost/boost_1_34_1.tar.bz2?download + boost | 1.35.0 | http://prdownloads.sf.net/boost/boost_1_35_0.tar.bz2?download Lua | 5.1 | http://www.lua.org/ pcre | 7.8 | http://www.pcre.org/ botan | 1.8 | http://botan.randombit.net/news/ @@ -196,8 +197,8 @@ 1. prerequisites: 15. boost; only need headers $ cd /usr/src - $ tar jxf boost_1_34_1.tar.bz2 - $ cd boost_1_34_1 + $ tar jxf boost_1_35_1.tar.bz2 + $ cd boost_1_35_1 $ cp -a boost /mingw/include 16. Lua @@ -301,10 +302,10 @@ 1.1 using boost in the build process: if the command shows a single directory named 'boost', you do not have to take any extra steps. configure will automatically find the necessary files. instead, if the command shows a directory name of the - form boost_1_33_1, boost-1.33.1 or similar, you will have to pass that + form boost_1_35_1, boost-1.35.1 or similar, you will have to pass that to the configure script. do so as follows: - ./configure CPPFLAGS="-I/usr/include/boost-1.33.1" + ./configure CPPFLAGS="-I/usr/include/boost-1.35.1" if no directories are shown, look for prebuilt boost packages for your system and install them. if there aren't any, resort to the procedure @@ -316,7 +317,7 @@ 1.1 using boost in the build process: your system -- for example, your home directory. once done, tell the configure script where the files are: - ./configure CPPFLAGS="-I${HOME}/boost-1.33.1" + ./configure CPPFLAGS="-I${HOME}/boost-1.35.1" it is important to note that, once monotone is built, you can get rid of all the boost sources or boost development packages from your system. ============================================================ --- Makefile.am 24a49b6a2886c1adcfbf6ecda1183626cce5d15b +++ Makefile.am 9f40743ffbeb4e789d9d1157fa1b01ef44362ec5 @@ -105,12 +105,6 @@ NETXX_SOURCES = \ netxx/streambase.h netxx/streamserver.h netxx/timeout.h \ netxx/types.h -BOOST_SANDBOX_SOURCES = \ - boost/circular_buffer_adaptor.hpp \ - boost/circular_buffer_base.hpp \ - boost/circular_buffer_fwd.hpp \ - boost/circular_buffer.hpp - UNIX_PLATFORM_SOURCES = \ unix/read_password.cc unix/get_system_flavour.cc \ unix/process.cc unix/terminal.cc unix/inodeprint.cc \ @@ -185,8 +179,7 @@ libplatform_a_SOURCES = platform.hh test noinst_LIBRARIES = libplatform.a lib3rdparty.a libplatform_a_SOURCES = platform.hh tester-plaf.hh -lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \ - $(NETXX_SOURCES) +lib3rdparty_a_SOURCES = $(NETXX_SOURCES) lib3rdparty_a_CPPFLAGS = # may be augmented in conditionals htmldir = $(datadir)/doc/monotone @@ -223,9 +216,8 @@ EXTERNAL_CPPFLAGS = $(pcre_CFLAGS) $(bot EXTERNAL_CPPFLAGS = $(pcre_CFLAGS) $(botan_CFLAGS) \ $(lua_CFLAGS) $(sqlite_CFLAGS) $(idn_CFLAGS) -EXTERNAL_LIBS = $(BOOSTLIBS) $(LIBICONV) $(LIBINTL) \ - $(pcre_LIBS) $(botan_LIBS) $(lua_LIBS) $(sqlite_LIBS) \ - $(idn_LIBS) +EXTERNAL_LIBS = $(botan_LIBS) $(lua_LIBS) $(pcre_LIBS) $(sqlite_LIBS) \ + $(idn_LIBS) $(LIBINTL) $(LIBICONV) mtn_CPPFLAGS = $(EXTERNAL_CPPFLAGS) mtn_CXXFLAGS = $(PCH_FLAGS) ============================================================ --- NEWS 06211c5e27366e09cc7f24e9b7bd9ea9de5b0c92 +++ NEWS 01c46c99d642728f798661004fc57a4ded91d254 @@ -1,3 +1,11 @@ +Changes from nvm.asio, please move down when landing on mainline: + + Changes + + - Monotone now requires at least version 1.35.0 of the Boost + headers. This enables us to get rid of even more bundled + copies of externally maintained source. + Changes from nvm.stripped, please move down when landing on mainline: Changes ============================================================ --- m4/boost.m4 f8acc6b6b0859c9ffc31e5e7a37502bc8345176c +++ m4/boost.m4 516d3302392e728c13e58e3b432933bbae00ac21 @@ -3,22 +3,22 @@ AC_DEFUN([BOOST_VERSION_CHECK], # Check for suitably new version of boost. AC_DEFUN([BOOST_VERSION_CHECK], [AC_LANG_ASSERT([C++]) - AC_CACHE_CHECK([boost version 1.33.0 or newer], - ac_cv_boost_version_least_1_33_0, + AC_CACHE_CHECK([for boost version 1.35.0 or newer], + ac_cv_boost_version_least_1_35_0, [ AC_COMPILE_IFELSE( [#include - #if BOOST_VERSION >= 103300 + #if BOOST_VERSION >= 103500 int main() { return 0; } #else #error boost version is too old #endif ], - ac_cv_boost_version_least_1_33_0=yes, - ac_cv_boost_version_least_1_33_0=no) + ac_cv_boost_version_least_1_35_0=yes, + ac_cv_boost_version_least_1_35_0=no) ]) - if test x$ac_cv_boost_version_least_1_33_0 = xno; then - AC_MSG_ERROR([boost 1.33.0 or newer required]) + if test x$ac_cv_boost_version_least_1_35_0 = xno; then + AC_MSG_FAILURE([boost 1.35.0 or newer required]) fi ])