aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2011-09-09 11:45:46 -0700
committerGavin Andresen <[email protected]>2011-09-09 11:45:46 -0700
commitb56658bdad2d4cff327df75759a407a686c0b77e (patch)
treef213f4c4ac43a7c1644d662eab6ec186656055f6
parentMerge pull request #505 from gavinandresen/unique_coinbase (diff)
parentUpdate gitian build descriptors to produce proper builds. (diff)
downloaddiscoin-b56658bdad2d4cff327df75759a407a686c0b77e.tar.xz
discoin-b56658bdad2d4cff327df75759a407a686c0b77e.zip
Merge pull request #508 from TheBlueMatt/master
Update gitian build descriptors to produce proper builds.
-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 963c38139..52b10bc33 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 8d0abf899..efa9cb8c1 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