diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-16 06:55:47 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-16 06:55:47 +0200 |
| commit | 5dd7318db75db580d602c72a2322df97d8712233 (patch) | |
| tree | e15a3c55d610d8c9e26ac2224d746e8b36a0450a /contrib | |
| parent | c1e667222ad7eac6403cd60aab4d5d09ed0ff02d (diff) | |
| parent | 217208a36d210e7d51e405d0e531ac2b75a3a087 (diff) | |
| download | bitcoin-5dd7318db75db580d602c72a2322df97d8712233.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-win32.yml | 1 | ||||
| -rw-r--r-- | contrib/gitian.yml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/contrib/gitian-win32.yml b/contrib/gitian-win32.yml index 963c381393..52b10bc33f 100644 --- a/contrib/gitian-win32.yml +++ b/contrib/gitian-win32.yml @@ -10,6 +10,7 @@ packages: - "unzip" - "nsis" - "faketime" +- "wine" reference_datetime: "2011-01-30 00:00:00" remotes: - "url": "https://github.com/bitcoin/bitcoin.git" diff --git a/contrib/gitian.yml b/contrib/gitian.yml index 8d0abf8994..efa9cb8c10 100644 --- a/contrib/gitian.yml +++ b/contrib/gitian.yml @@ -34,7 +34,7 @@ script: | mkdir wxWidgets-2.9.2 cd wxWidgets-2.9.2 unzip ../wxWidgets-2.9.2-x32-gitian.zip - unzip -f ../wxWidgets-2.9.2-x64-gitian.zip + unzip -o ../wxWidgets-2.9.2-x64-gitian.zip cp -a bin/$GBUILD_BITS/wx/config/gtk2-unicode-static-2.9 $INSTDIR/bin/wx-config for lib in wx_gtk2u wxregexu wxtiff; do ar rc $INSTDIR/lib/lib${lib}-2.9.a bin/$GBUILD_BITS/$lib/*.o |