LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #3501

Browse source 
56fce1f Upgrade gitian win32 to boost-1.55. (Warren Togami)
This commit is contained in:
Wladimir J. van der Laan 2014-01-10 11:35:48 +01:00
commit 5c72e3df3c
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/gitian-descriptors/boost-win32.yml
View file

@ -12,19 +12,19 @@ packages:
reference_datetime: "2011-01-30 00:00:00" reference_datetime: "2011-01-30 00:00:00"
remotes: [] remotes: []
files: files:
- "boost_1_54_0.tar.bz2" - "boost_1_55_0.tar.bz2"
- "boost-mingw-gas-cross-compile-2013-03-03.patch" - "boost-mingw-gas-cross-compile-2013-03-03.patch"
script: | script: |
# Defines # Defines
INSTALLPREFIX="$OUTDIR/staging/boost" INSTALLPREFIX="$OUTDIR/staging/boost"
HOST=i686-w64-mingw32 HOST=i686-w64-mingw32
# Input Integrity Check # Input Integrity Check
echo "047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d boost_1_54_0.tar.bz2" | shasum -c echo "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 boost_1_55_0.tar.bz2" | shasum -c
echo "d2b7f6a1d7051faef3c9cf41a92fa3671d905ef1e1da920d07651a43299f6268 boost-mingw-gas-cross-compile-2013-03-03.patch" | shasum -c echo "d2b7f6a1d7051faef3c9cf41a92fa3671d905ef1e1da920d07651a43299f6268 boost-mingw-gas-cross-compile-2013-03-03.patch" | shasum -c
mkdir -p "$INSTALLPREFIX" mkdir -p "$INSTALLPREFIX"
tar xjf boost_1_54_0.tar.bz2 tar xjf boost_1_55_0.tar.bz2
cd boost_1_54_0 cd boost_1_55_0
GCCVERSION=$($HOST-g++ -E -dM $(mktemp --suffix=.h) | grep __VERSION__ | cut -d ' ' -f 3 | cut -d '"' -f 2) GCCVERSION=$($HOST-g++ -E -dM $(mktemp --suffix=.h) | grep __VERSION__ | cut -d ' ' -f 3 | cut -d '"' -f 2)
echo "using gcc : $GCCVERSION : $HOST-g++ echo "using gcc : $GCCVERSION : $HOST-g++
: :
@ -48,7 +48,7 @@ script: |
# Patch Mirror: http://rose.makesad.us/~paulproteus/mirrors/boost-mingw-gas-cross-compile-2013-03-03.patch # Patch Mirror: http://rose.makesad.us/~paulproteus/mirrors/boost-mingw-gas-cross-compile-2013-03-03.patch
patch -p0 < ../boost-mingw-gas-cross-compile-2013-03-03.patch patch -p0 < ../boost-mingw-gas-cross-compile-2013-03-03.patch
# Bug Workaround: boost-1.54.0 broke the ability to disable zlib # Bug Workaround: boost-1.54.0 broke the ability to disable zlib, still broken in 1.55
# https://svn.boost.org/trac/boost/ticket/9156 # https://svn.boost.org/trac/boost/ticket/9156
sed -i 's^\[ ac.check-library /zlib//zlib : <library>/zlib//zlib^^' libs/iostreams/build/Jamfile.v2 sed -i 's^\[ ac.check-library /zlib//zlib : <library>/zlib//zlib^^' libs/iostreams/build/Jamfile.v2
sed -i 's^<source>zlib.cpp <source>gzip.cpp \]^^' libs/iostreams/build/Jamfile.v2 sed -i 's^<source>zlib.cpp <source>gzip.cpp \]^^' libs/iostreams/build/Jamfile.v2
@ -62,5 +62,5 @@ script: |
cd "$INSTALLPREFIX" cd "$INSTALLPREFIX"
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.54.0-gitian-r6.zip * zip -r boost-win32-1.55.0-gitian-r6.zip *
cp boost-win32-1.54.0-gitian-r6.zip $OUTDIR cp boost-win32-1.55.0-gitian-r6.zip $OUTDIR

4
contrib/gitian-descriptors/gitian-win32.yml
View file

@ -23,7 +23,7 @@ remotes:
"dir": "bitcoin" "dir": "bitcoin"
files: files:
- "qt-win32-4.8.3-gitian-r4.zip" - "qt-win32-4.8.3-gitian-r4.zip"
- "boost-win32-1.54.0-gitian-r6.zip" - "boost-win32-1.55.0-gitian-r6.zip"
- "bitcoin-deps-win32-gitian-r9.zip" - "bitcoin-deps-win32-gitian-r9.zip"
- "protobuf-win32-2.5.0-gitian-r3.zip" - "protobuf-win32-2.5.0-gitian-r3.zip"
script: | script: |
@ -35,7 +35,7 @@ script: |
mkdir -p $STAGING mkdir -p $STAGING
cd $STAGING cd $STAGING
unzip ../build/qt-win32-4.8.3-gitian-r4.zip unzip ../build/qt-win32-4.8.3-gitian-r4.zip
unzip ../build/boost-win32-1.54.0-gitian-r6.zip unzip ../build/boost-win32-1.55.0-gitian-r6.zip
unzip ../build/bitcoin-deps-win32-gitian-r9.zip unzip ../build/bitcoin-deps-win32-gitian-r9.zip
unzip ../build/protobuf-win32-2.5.0-gitian-r3.zip unzip ../build/protobuf-win32-2.5.0-gitian-r3.zip
cd $HOME/build/ cd $HOME/build/