Browse Source

Upgrade to Boost 1.49 on Win32

miguelfreitas
Matt Corallo 13 years ago
parent
commit
39471861d5
  1. 10
      contrib/gitian-descriptors/boost-win32.yml
  2. 8
      contrib/gitian-descriptors/gitian-win32.yml
  3. 4
      src/makefile.linux-mingw
  4. 12
      src/makefile.mingw

10
contrib/gitian-descriptors/boost-win32.yml

@ -11,12 +11,12 @@ packages:
reference_datetime: "2011-01-30 00:00:00" reference_datetime: "2011-01-30 00:00:00"
remotes: [] remotes: []
files: files:
- "boost_1_47_0.tar.bz2" - "boost_1_49_0.tar.bz2"
script: | script: |
TMPDIR="$HOME/tmpdir" TMPDIR="$HOME/tmpdir"
mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include
tar xjf boost_1_47_0.tar.bz2 tar xjf boost_1_49_0.tar.bz2
cd boost_1_47_0 cd boost_1_49_0
echo "using gcc : 4.4 : i586-mingw32msvc-g++ echo "using gcc : 4.4 : i586-mingw32msvc-g++
: :
<rc>i586-mingw32msvc-windres <rc>i586-mingw32msvc-windres
@ -34,5 +34,5 @@ script: |
cd $TMPDIR cd $TMPDIR
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME export FAKETIME=$REFERENCE_DATETIME
zip -r boost-win32-1.47.0-gitian.zip * zip -r boost-win32-1.49.0-gitian.zip *
cp boost-win32-1.47.0-gitian.zip $OUTDIR cp boost-win32-1.49.0-gitian.zip $OUTDIR

8
contrib/gitian-descriptors/gitian-win32.yml

@ -16,7 +16,7 @@ remotes:
"dir": "bitcoin" "dir": "bitcoin"
files: files:
- "qt-win32-4.7.4-gitian.zip" - "qt-win32-4.7.4-gitian.zip"
- "boost-win32-1.47.0-gitian.zip" - "boost-win32-1.49.0-gitian.zip"
- "bitcoin-deps-0.0.4.zip" - "bitcoin-deps-0.0.4.zip"
script: | script: |
# #
@ -26,10 +26,10 @@ script: |
cd $HOME/build/ cd $HOME/build/
export PATH=$PATH:$HOME/qt/bin/ export PATH=$PATH:$HOME/qt/bin/
# #
mkdir boost_1_47_0 mkdir boost_1_49_0
cd boost_1_47_0 cd boost_1_49_0
mkdir -p stage/lib mkdir -p stage/lib
unzip ../boost-win32-1.47.0-gitian.zip unzip ../boost-win32-1.49.0-gitian.zip
cd bin/$GBUILD_BITS cd bin/$GBUILD_BITS
for lib in *; do for lib in *; do
i586-mingw32msvc-ar rc ../../stage/lib/libboost_${lib}-mt-s.a $lib/*.o i586-mingw32msvc-ar rc ../../stage/lib/libboost_${lib}-mt-s.a $lib/*.o

4
src/makefile.linux-mingw

@ -7,14 +7,14 @@ DEPSDIR:=/usr/i586-mingw32msvc
USE_UPNP:=0 USE_UPNP:=0
INCLUDEPATHS= \ INCLUDEPATHS= \
-I"$(DEPSDIR)/boost_1_47_0" \ -I"$(DEPSDIR)/boost_1_49_0" \
-I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
-I"$(DEPSDIR)/openssl-1.0.1b/include" \ -I"$(DEPSDIR)/openssl-1.0.1b/include" \
-I"$(DEPSDIR)" \ -I"$(DEPSDIR)" \
-I"$(CURDIR)"/obj \ -I"$(CURDIR)"/obj \
LIBPATHS= \ LIBPATHS= \
-L"$(DEPSDIR)/boost_1_47_0/stage/lib" \ -L"$(DEPSDIR)/boost_1_49_0/stage/lib" \
-L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
-L"$(DEPSDIR)/openssl-1.0.1b" -L"$(DEPSDIR)/openssl-1.0.1b"

12
src/makefile.mingw

@ -5,20 +5,20 @@
USE_UPNP:=0 USE_UPNP:=0
INCLUDEPATHS= \ INCLUDEPATHS= \
-I"C:\boost-1.47.0-mgw" \ -I"C:\boost-1.49.0-mgw" \
-I"C:\db-4.8.30.NC-mgw\build_unix" \ -I"C:\db-4.8.30.NC-mgw\build_unix" \
-I"C:\openssl-1.0.0d-mgw\include" -I"C:\openssl-1.0.0d-mgw\include"
LIBPATHS= \ LIBPATHS= \
-L"C:\boost-1.47.0-mgw\stage\lib" \ -L"C:\boost-1.49.0-mgw\stage\lib" \
-L"C:\db-4.8.30.NC-mgw\build_unix" \ -L"C:\db-4.8.30.NC-mgw\build_unix" \
-L"C:\openssl-1.0.0d-mgw" -L"C:\openssl-1.0.0d-mgw"
LIBS= \ LIBS= \
-l boost_system-mgw45-mt-s-1_47 \ -l boost_system-mgw45-mt-s-1_49 \
-l boost_filesystem-mgw45-mt-s-1_47 \ -l boost_filesystem-mgw45-mt-s-1_49 \
-l boost_program_options-mgw45-mt-s-1_47 \ -l boost_program_options-mgw45-mt-s-1_49 \
-l boost_thread-mgw45-mt-s-1_47 \ -l boost_thread-mgw45-mt-s-1_49 \
-l db_cxx \ -l db_cxx \
-l ssl \ -l ssl \
-l crypto -l crypto

Loading…
Cancel
Save