diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2013-09-18 15:35:33 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2013-09-18 15:36:48 -0400 |
| commit | 8d36b2dcfb4101c9921749f361ad7b552eca23f1 (patch) | |
| tree | 7572b22261a5f761d4856059d8b1976fe2c57d3c | |
| parent | 2e9c8aed310bb90b607954f3b0d5135545f55a10 (diff) | |
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.
| -rw-r--r-- | contrib/gitian-descriptors/deps-win32.yml | 4 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/gitian-descriptors/deps-win32.yml b/contrib/gitian-descriptors/deps-win32.yml index 98f69dddf0..b00269dcc3 100644 --- a/contrib/gitian-descriptors/deps-win32.yml +++ b/contrib/gitian-descriptors/deps-win32.yml @@ -39,7 +39,7 @@ script: | # tar xzf db-4.8.30.NC.tar.gz 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 install_lib install_include cd ../.. @@ -77,6 +77,6 @@ script: | cd .. # 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 killall wineserver services.exe explorer.exe winedevice.exe diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 87e05b4610..db47a0b2ef 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -23,7 +23,7 @@ remotes: files: - "qt-win32-4.8.3-gitian-r3.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" script: | # @@ -32,7 +32,7 @@ script: | cd $STAGING unzip ../build/qt-win32-4.8.3-gitian-r3.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 cd $HOME/build/ # |