diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-10 11:35:48 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-10 11:35:59 +0100 |
| commit | 5c72e3df3c52d3eb4fe42551cd09d41bdf3bcda4 (patch) | |
| tree | dfd7ad7f2149ef6407ff1148b7b20e7980ea827e /contrib | |
| parent | 6b06e4fd0d5a0524ae2d128a96dbeb39ca016d33 (diff) | |
| parent | 56fce1fdbb688e9c48ba689d8f69bf66501d91c5 (diff) | |
Merge pull request #3501
56fce1f Upgrade gitian win32 to boost-1.55. (Warren Togami)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/boost-win32.yml | 14 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml index b421cbe8c5..b14cd1f6c2 100644 --- a/contrib/gitian-descriptors/boost-win32.yml +++ b/contrib/gitian-descriptors/boost-win32.yml @@ -12,19 +12,19 @@ packages: reference_datetime: "2011-01-30 00:00:00" remotes: [] files: -- "boost_1_54_0.tar.bz2" +- "boost_1_55_0.tar.bz2" - "boost-mingw-gas-cross-compile-2013-03-03.patch" script: | # Defines INSTALLPREFIX="$OUTDIR/staging/boost" HOST=i686-w64-mingw32 # 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 mkdir -p "$INSTALLPREFIX" - tar xjf boost_1_54_0.tar.bz2 - cd boost_1_54_0 + tar xjf boost_1_55_0.tar.bz2 + cd boost_1_55_0 GCCVERSION=$($HOST-g++ -E -dM $(mktemp --suffix=.h) | grep __VERSION__ | cut -d ' ' -f 3 | cut -d '"' -f 2) 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 -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 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 @@ -62,5 +62,5 @@ script: | cd "$INSTALLPREFIX" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME - zip -r boost-win32-1.54.0-gitian-r6.zip * - cp boost-win32-1.54.0-gitian-r6.zip $OUTDIR + zip -r boost-win32-1.55.0-gitian-r6.zip * + cp boost-win32-1.55.0-gitian-r6.zip $OUTDIR diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 95db2d9066..a863335ce9 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -23,7 +23,7 @@ remotes: "dir": "bitcoin" files: - "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" - "protobuf-win32-2.5.0-gitian-r3.zip" script: | @@ -35,7 +35,7 @@ script: | mkdir -p $STAGING cd $STAGING 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/protobuf-win32-2.5.0-gitian-r3.zip cd $HOME/build/ |