aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMatt Corallo <matt@bluematt.me>2011-09-03 02:21:55 -0400
committerMatt Corallo <matt@bluematt.me>2011-09-03 12:38:20 -0400
commit7b7d46be8999ed6fc76b2abca71b40a5fe2e77a5 (patch)
treee250173d9518b6b6a9f91f555515fa740c49bae8 /contrib
parent7464e647decace52bc075d9ac8788974504e0bb9 (diff)
Fix build process to actually work.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gitian.yml6
-rw-r--r--contrib/wxwidgets.yml4
2 files changed, 6 insertions, 4 deletions
diff --git a/contrib/gitian.yml b/contrib/gitian.yml
index 9f03ba1bc4..8d0abf8994 100644
--- a/contrib/gitian.yml
+++ b/contrib/gitian.yml
@@ -18,7 +18,8 @@ remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
files:
-- "wxWidgets-2.9.2-gitian.zip"
+- "wxWidgets-2.9.2-x64-gitian.zip"
+- "wxWidgets-2.9.2-x32-gitian.zip"
- "miniupnpc-1.6.tar.gz"
script: |
INSTDIR="$HOME/install"
@@ -32,7 +33,8 @@ script: |
mkdir -p $INSTDIR/bin $INSTDIR/lib/wx $INSTDIR/include
mkdir wxWidgets-2.9.2
cd wxWidgets-2.9.2
- unzip ../wxWidgets-2.9.2-gitian.zip
+ unzip ../wxWidgets-2.9.2-x32-gitian.zip
+ unzip -f ../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
diff --git a/contrib/wxwidgets.yml b/contrib/wxwidgets.yml
index a2406936d3..0509615101 100644
--- a/contrib/wxwidgets.yml
+++ b/contrib/wxwidgets.yml
@@ -38,5 +38,5 @@ script: |
cd $TMPDIR
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME
- zip -r wxWidgets-2.9.2-gitian.zip *
- cp wxWidgets-2.9.2-gitian.zip $OUTDIR
+ zip -r wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip *
+ cp wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip $OUTDIR