Browse Source

Merge pull request #887 from TheBlueMatt/gitian_deps

Make deps build deterministic and upgrade to libpng 1.5.9.
0.8
Pieter Wuille 13 years ago
parent
commit
35b327a520
  1. 24
      contrib/gitian-descriptors/deps-win32.yml
  2. 4
      contrib/gitian-descriptors/gitian-win32.yml
  3. 2
      doc/release-process.txt

24
contrib/gitian-descriptors/deps-win32.yml

@ -7,7 +7,7 @@ architectures:
packages: packages:
- "mingw32" - "mingw32"
- "git-core" - "git-core"
- "unzip" - "zip"
- "faketime" - "faketime"
- "wine" - "wine"
reference_datetime: "2011-01-30 00:00:00" reference_datetime: "2011-01-30 00:00:00"
@ -17,9 +17,13 @@ files:
- "db-4.8.30.NC.tar.gz" - "db-4.8.30.NC.tar.gz"
- "miniupnpc-1.6.tar.gz" - "miniupnpc-1.6.tar.gz"
- "zlib-1.2.6.tar.gz" - "zlib-1.2.6.tar.gz"
- "libpng-1.5.8.tar.gz" - "libpng-1.5.9.tar.gz"
- "qrencode-3.2.0.tar.bz2" - "qrencode-3.2.0.tar.bz2"
script: | script: |
#
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME
export TZ=UTC
# #
tar xzf openssl-1.0.0e.tar.gz tar xzf openssl-1.0.0e.tar.gz
cd openssl-1.0.0e cd openssl-1.0.0e
@ -46,16 +50,22 @@ script: |
make -f win32/Makefile.gcc PREFIX=i586-mingw32msvc- $MAKEOPTS make -f win32/Makefile.gcc PREFIX=i586-mingw32msvc- $MAKEOPTS
cd .. cd ..
# #
tar xzf libpng-1.5.8.tar.gz tar xzf libpng-1.5.9.tar.gz
cd libpng-1.5.8 cd libpng-1.5.9
./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld LDFLAGS="-L../zlib-1.2.6/" CFLAGS="-I../zlib-1.2.6/" ./configure -disable-shared CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld LDFLAGS="-L../zlib-1.2.6/" CFLAGS="-I../zlib-1.2.6/"
make $MAKEOPTS make $MAKEOPTS
cd .. cd ..
# #
tar xjf qrencode-3.2.0.tar.bz2 tar xjf qrencode-3.2.0.tar.bz2
cd qrencode-3.2.0 cd qrencode-3.2.0
./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld png_LIBS="../libpng-1.5.8/.libs/libpng15.a ../zlib-1.2.6/libz.a" png_CFLAGS="-I../libpng-1.5.8" ./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld png_LIBS="../libpng-1.5.9/.libs/libpng15.a ../zlib-1.2.6/libz.a" png_CFLAGS="-I../libpng-1.5.9"
make $MAKEOPTS make $MAKEOPTS
cd .. cd ..
# #
tar cjvpf "$OUTDIR/bitcoin-deps-0.0.1.tbz2" "$HOME/build" zip -r $OUTDIR/bitcoin-deps-0.0.3.zip \
$(ls qrencode-*/{qrencode.h,.libs/libqrencode.{,l}a} | sort) \
$(ls db-*/build_unix/{libdb_cxx.a,db.h,db_cxx.h,libdb.a,.libs/libdb_cxx-?.?.a} | sort) \
$(find openssl-* -name '*.a' -o -name '*.h' | sort) \
$(find miniupnpc -name '*.h' -o -name 'libminiupnpc.a' | sort)
# Kill wine processes as gitian won't figure out we are done otherwise
killall wineserver services.exe explorer.exe winedevice.exe

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

@ -17,7 +17,7 @@ remotes:
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.47.0-gitian.zip"
- "bitcoin-deps-0.0.1.tbz2" - "bitcoin-deps-0.0.3.zip"
script: | script: |
# #
mkdir $HOME/qt mkdir $HOME/qt
@ -39,7 +39,7 @@ script: |
mv include/boost . mv include/boost .
cd .. cd ..
# #
tar -C / -xjvpf bitcoin-deps-0.0.1.tbz2 unzip bitcoin-deps-0.0.3.zip
# #
find -type f | xargs touch --date="$REFERENCE_DATETIME" find -type f | xargs touch --date="$REFERENCE_DATETIME"
# #

2
doc/release-process.txt

@ -27,7 +27,7 @@
wget 'http://www.openssl.org/source/openssl-1.0.0e.tar.gz' wget 'http://www.openssl.org/source/openssl-1.0.0e.tar.gz'
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
wget 'http://zlib.net/zlib-1.2.6.tar.gz' wget 'http://zlib.net/zlib-1.2.6.tar.gz'
wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.8.tar.gz' wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz'
wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
wget 'http://downloads.sourceforge.net/project/boost/boost/1.47.0/boost_1_47_0.tar.bz2' wget 'http://downloads.sourceforge.net/project/boost/boost/1.47.0/boost_1_47_0.tar.bz2'
wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz' wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz'

Loading…
Cancel
Save