diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-06 05:26:23 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-06 05:26:23 -0700 |
| commit | c5eed9a1ae373607f50a733ff5c57e672321f91d (patch) | |
| tree | c30814fc6746bae844d61417c92423e9408ca869 | |
| parent | a79401b31d883780827db512a4eda7d1ad354a95 (diff) | |
| parent | 7b7d46be8999ed6fc76b2abca71b40a5fe2e77a5 (diff) | |
| download | bitcoin-c5eed9a1ae373607f50a733ff5c57e672321f91d.tar.xz | |
Merge pull request #490 from TheBlueMatt/master
Fix build process to actually work (yet again).
| -rw-r--r-- | contrib/gitian.yml | 6 | ||||
| -rw-r--r-- | contrib/wxwidgets.yml | 4 |
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 |