Sfoglia il codice sorgente

Upgrade to Boost 1.49 on Win32

tags/v0.15.1
Matt Corallo 9 anni fa
parent
commit
39471861d5

+ 5
- 5
contrib/gitian-descriptors/boost-win32.yml Vedi File

@@ -11,12 +11,12 @@ packages:
reference_datetime: "2011-01-30 00:00:00"
remotes: []
files:
- "boost_1_47_0.tar.bz2"
- "boost_1_49_0.tar.bz2"
script: |
TMPDIR="$HOME/tmpdir"
mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include
tar xjf boost_1_47_0.tar.bz2
cd boost_1_47_0
tar xjf boost_1_49_0.tar.bz2
cd boost_1_49_0
echo "using gcc : 4.4 : i586-mingw32msvc-g++
:
<rc>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.47.0-gitian.zip *
cp boost-win32-1.47.0-gitian.zip $OUTDIR
zip -r boost-win32-1.49.0-gitian.zip *
cp boost-win32-1.49.0-gitian.zip $OUTDIR

+ 4
- 4
contrib/gitian-descriptors/gitian-win32.yml Vedi File

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

+ 2
- 2
src/makefile.linux-mingw Vedi File

@@ -7,14 +7,14 @@ DEPSDIR:=/usr/i586-mingw32msvc
USE_UPNP:=0

INCLUDEPATHS= \
-I"$(DEPSDIR)/boost_1_47_0" \
-I"$(DEPSDIR)/boost_1_49_0" \
-I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
-I"$(DEPSDIR)/openssl-1.0.1b/include" \
-I"$(DEPSDIR)" \
-I"$(CURDIR)"/obj \

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)/openssl-1.0.1b"


+ 6
- 6
src/makefile.mingw Vedi File

@@ -5,20 +5,20 @@
USE_UPNP:=0

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:\openssl-1.0.0d-mgw\include"

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:\openssl-1.0.0d-mgw"

LIBS= \
-l boost_system-mgw45-mt-s-1_47 \
-l boost_filesystem-mgw45-mt-s-1_47 \
-l boost_program_options-mgw45-mt-s-1_47 \
-l boost_thread-mgw45-mt-s-1_47 \
-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 db_cxx \
-l ssl \
-l crypto

Loading…
Annulla
Salva