diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 92103f1e3..57ef40997 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -298,7 +298,7 @@ OTHER_FILES += \ # platform specific defaults, if not overridden on command line isEmpty(BOOST_LIB_SUFFIX) { macx:BOOST_LIB_SUFFIX = -mt - windows:BOOST_LIB_SUFFIX = -mgw44-mt-s-1_49 + windows:BOOST_LIB_SUFFIX = -mgw44-mt-s-1_50 } isEmpty(BOOST_THREAD_LIB_SUFFIX) { diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml index c4a9f3310..1eeb9eaa2 100644 --- a/contrib/gitian-descriptors/boost-win32.yml +++ b/contrib/gitian-descriptors/boost-win32.yml @@ -11,12 +11,12 @@ packages: reference_datetime: "2011-01-30 00:00:00" remotes: [] files: -- "boost_1_49_0.tar.bz2" +- "boost_1_50_0.tar.bz2" script: | TMPDIR="$HOME/tmpdir" mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include - tar xjf boost_1_49_0.tar.bz2 - cd boost_1_49_0 + tar xjf boost_1_50_0.tar.bz2 + cd boost_1_50_0 echo "using gcc : 4.4 : i586-mingw32msvc-g++ : i586-mingw32msvc-windres @@ -34,5 +34,5 @@ script: | cd $TMPDIR export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME - zip -r boost-win32-1.49.0-gitian2.zip * - cp boost-win32-1.49.0-gitian2.zip $OUTDIR + zip -r boost-win32-1.50.0-gitian2.zip * + cp boost-win32-1.50.0-gitian2.zip $OUTDIR diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index fed0b90e6..89c22da94 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -16,7 +16,7 @@ remotes: "dir": "bitcoin" files: - "qt-win32-4.7.4-gitian.zip" -- "boost-win32-1.49.0-gitian2.zip" +- "boost-win32-1.50.0-gitian2.zip" - "bitcoin-deps-0.0.4.zip" script: | # @@ -26,10 +26,10 @@ script: | cd $HOME/build/ export PATH=$PATH:$HOME/qt/bin/ # - mkdir boost_1_49_0 - cd boost_1_49_0 + mkdir boost_1_50_0 + cd boost_1_50_0 mkdir -p stage/lib - unzip ../boost-win32-1.49.0-gitian2.zip + unzip ../boost-win32-1.50.0-gitian2.zip cd bin/$GBUILD_BITS for lib in *; do i586-mingw32msvc-ar rc ../../stage/lib/libboost_${lib}-mt-s.a $lib/*.o @@ -51,7 +51,7 @@ script: | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC - $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_49_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_49_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.1b OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1b/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin USE_BUILD_INFO=1 + $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_50_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_50_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.1b OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1b/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin USE_BUILD_INFO=1 make $MAKEOPTS cp release/bitcoin-qt.exe $OUTDIR/ # diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index ad74aa6c9..93e3fe9aa 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -10,13 +10,13 @@ USE_IPV6:=1 INCLUDEPATHS= \ -I"$(CURDIR)" \ -I"$(CURDIR)"/obj \ - -I"$(DEPSDIR)/boost_1_49_0" \ + -I"$(DEPSDIR)/boost_1_50_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -I"$(DEPSDIR)/openssl-1.0.1b/include" \ -I"$(DEPSDIR)" LIBPATHS= \ - -L"$(DEPSDIR)/boost_1_49_0/stage/lib" \ + -L"$(DEPSDIR)/boost_1_50_0/stage/lib" \ -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -L"$(DEPSDIR)/openssl-1.0.1b" diff --git a/src/makefile.mingw b/src/makefile.mingw index 6102dad61..58a12e209 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -6,20 +6,20 @@ USE_UPNP:=0 USE_IPV6:=1 INCLUDEPATHS= \ - -I"C:\boost-1.49.0-mgw" \ + -I"C:\boost-1.50.0-mgw" \ -I"C:\db-4.8.30.NC-mgw\build_unix" \ -I"C:\openssl-1.0.1b-mgw\include" LIBPATHS= \ - -L"C:\boost-1.49.0-mgw\stage\lib" \ + -L"C:\boost-1.50.0-mgw\stage\lib" \ -L"C:\db-4.8.30.NC-mgw\build_unix" \ -L"C:\openssl-1.0.1b-mgw" LIBS= \ - -l boost_system-mgw45-mt-s-1_49 \ - -l boost_filesystem-mgw45-mt-s-1_49 \ - -l boost_program_options-mgw45-mt-s-1_49 \ - -l boost_thread-mgw45-mt-s-1_49 \ + -l boost_system-mgw45-mt-s-1_50 \ + -l boost_filesystem-mgw45-mt-s-1_50 \ + -l boost_program_options-mgw45-mt-s-1_50 \ + -l boost_thread-mgw45-mt-s-1_50 \ -l db_cxx \ -l ssl \ -l crypto