diff -uNr a/bitcoin/build/Makefile b/bitcoin/build/Makefile --- a/bitcoin/build/Makefile 621a912dc452b7aaa5b338876d4439d2c550d0495377513f01e0b110dd54fec5112568e0154dc69080dc2385b54da03d0f284b0d185eaf98d236ceca3fe410dd +++ b/bitcoin/build/Makefile 41b59259871a10241f2f34cd63d6b9500d5afe206c7669a308ec76cfaa1666a77c22d4d70c888816de2ee84fa47bd32447c583a338f1954e994b46f94568c566 @@ -35,9 +35,9 @@ cd $(BOOST) && \ patch -p1 < $(DIST)/boost-no-demangler.patch && \ echo "using gcc : : $(CXX) ;" >> tools/build/v2/user-config.jam && \ - ./bootstrap.sh && \ - ./bjam toolset=gcc link=static -sNO_BZIP2=1 -sNO_ZLIB=1 -sNO_COMPRESSION=1 && \ - ./bjam toolset=gcc link=static -sNO_COMPRESSION=1 --prefix=$(OURLIBS) install + ./bootstrap.sh --with-libraries=filesystem,program_options,test,thread && \ + ./bjam toolset=gcc link=static && \ + ./bjam toolset=gcc link=static --prefix=$(OURLIBS) install touch boost.stamp bdb.stamp: diff -uNr a/bitcoin/manifest b/bitcoin/manifest --- a/bitcoin/manifest 25283df35efdf4182533b2e3e7a9353b1ba500f83ac2de72abe3abdb245c84e882afb66643ba7d917e2a8f0b78a84aeb4f3e900fa603be68fd0dfeadcffcac95 +++ b/bitcoin/manifest 3d238d061aa136b7e513428f29f58699ea0fcefa01e30d1680afa84e31a4151dd730e59283d6db81bda6a8d06bc6a76169f9b584c3a7fbbb6e719f1f8b77937b @@ -37,3 +37,4 @@ 688130 bitcoin_dumpblock_no_losers jfw Correct 'dumpblock' to restrict its search to the current best chain, rather than dumping the first matching block by height (which may have lost the mining race and been reorganized away). 696655 bitcoin_help_tuneups jfw Don't hide help for wallet commands based on current encryption state; accept -help for consistency; rewrite inane help for -highs/-lows options; add help for -disablesafemode; make it and -testsafemode use explicit variables for consistency and centricity of options; clarify warning message shown in safe mode and change the political interpretation it offers; fix inept formatting in the parts otherwise touched. 696655 bitcoin_permissive_mode jfw Add -permissive option to disable the potentially isolating effects of the malleus_mikehearnificarum; remove -caneat option, always allowing 'eatblock' which has no need for such childproofing. +707665 bitcoin_boost_prune_built_libs jfw Reduce precompiled Boost libraries to the four actually in use. diff -uNr a/bitcoin/src/bitcoinrpc.cpp b/bitcoin/src/bitcoinrpc.cpp --- a/bitcoin/src/bitcoinrpc.cpp 97976332adfd66270c0b7de06444c9b4ba3eb4805b92357d6c5e3d4452460b6f743d1ccc6370b261c02124c4be6f772b4332d4241da13d761426b80dac27c246 +++ b/bitcoin/src/bitcoinrpc.cpp 298fb81c68959629fe77be43b445905a4708b468cb6d780c560efddf09eb99985ac0f5159bf92ed8a9a4bb5f179d895d3fafc2ed37575f251bd0bd4f4ea9fe2e @@ -10,8 +10,8 @@ #include "util.h" #undef printf #include -#include -#include +// These two comment lines are to preserve line numbering and thus identical disassembly in a pruning of unused boost includes (the line number dependence there comes from ENTER_CRITICAL_SECTION). +// They can be freely removed at a later stage. #include #include "json/json_spirit_reader_template.h" #include "json/json_spirit_writer_template.h"