Browse Source

gitian: fix win32 build after configure bdb changes

bitcoin incorrectly linked against the dll after the configure changes, so
ensure that only the static lib is installed.
0.10
Cory Fields 11 years ago
parent
commit
8d36b2dcfb
  1. 4
      contrib/gitian-descriptors/deps-win32.yml
  2. 4
      contrib/gitian-descriptors/gitian-win32.yml

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

@ -39,7 +39,7 @@ script: |
# #
tar xzf db-4.8.30.NC.tar.gz tar xzf db-4.8.30.NC.tar.gz
cd db-4.8.30.NC/build_unix cd db-4.8.30.NC/build_unix
../dist/configure --prefix=$INSTALLPREFIX --enable-mingw --enable-cxx --host=$HOST ../dist/configure --prefix=$INSTALLPREFIX --enable-mingw --enable-cxx --host=$HOST --disable-shared
make $MAKEOPTS library_build make $MAKEOPTS library_build
make install_lib install_include make install_lib install_include
cd ../.. cd ../..
@ -77,6 +77,6 @@ script: |
cd .. cd ..
# #
cd $INSTALLPREFIX cd $INSTALLPREFIX
zip -r $OUTDIR/bitcoin-deps-0.0.6.zip include lib zip -r $OUTDIR/bitcoin-deps-0.0.7.zip include lib
# Kill wine processes as gitian won't figure out we are done otherwise # Kill wine processes as gitian won't figure out we are done otherwise
killall wineserver services.exe explorer.exe winedevice.exe killall wineserver services.exe explorer.exe winedevice.exe

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

@ -23,7 +23,7 @@ remotes:
files: files:
- "qt-win32-4.8.3-gitian-r3.zip" - "qt-win32-4.8.3-gitian-r3.zip"
- "boost-win32-1.50.0-gitian3.zip" - "boost-win32-1.50.0-gitian3.zip"
- "bitcoin-deps-0.0.6.zip" - "bitcoin-deps-0.0.7.zip"
- "protobuf-win32-2.5.0-gitian-r2.zip" - "protobuf-win32-2.5.0-gitian-r2.zip"
script: | script: |
# #
@ -32,7 +32,7 @@ script: |
cd $STAGING cd $STAGING
unzip ../build/qt-win32-4.8.3-gitian-r3.zip unzip ../build/qt-win32-4.8.3-gitian-r3.zip
unzip ../build/boost-win32-1.50.0-gitian3.zip unzip ../build/boost-win32-1.50.0-gitian3.zip
unzip ../build/bitcoin-deps-0.0.6.zip unzip ../build/bitcoin-deps-0.0.7.zip
unzip ../build/protobuf-win32-2.5.0-gitian-r2.zip unzip ../build/protobuf-win32-2.5.0-gitian-r2.zip
cd $HOME/build/ cd $HOME/build/
# #

Loading…
Cancel
Save