aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Corallo <matt@bluematt.me>2011-09-09 11:49:49 -0400
committerMatt Corallo <matt@bluematt.me>2011-09-09 12:35:42 -0400
commit02959124791830bad7762abd105e5934cccde60e (patch)
treef213f4c4ac43a7c1644d662eab6ec186656055f6
parentb7598ceefa362ec1b97e7a6a8a28aa38cf9a3c96 (diff)
Update gitian build descriptors to produce proper builds.
Thanks to makomk for finding the bugs here and devrandom for passing them along (see https://bitcointalk.org/index.php?topic=42198.msg514312#msg514312)
-rw-r--r--contrib/gitian-win32.yml1
-rw-r--r--contrib/gitian.yml2
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