Merge pull request #490 from TheBlueMatt/master
Fix build process to actually work (yet again).
This commit is contained in:
commit
c5eed9a1ae
2 changed files with 6 additions and 4 deletions
|
@ -18,7 +18,8 @@ remotes:
|
||||||
- "url": "https://github.com/bitcoin/bitcoin.git"
|
- "url": "https://github.com/bitcoin/bitcoin.git"
|
||||||
"dir": "bitcoin"
|
"dir": "bitcoin"
|
||||||
files:
|
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"
|
- "miniupnpc-1.6.tar.gz"
|
||||||
script: |
|
script: |
|
||||||
INSTDIR="$HOME/install"
|
INSTDIR="$HOME/install"
|
||||||
|
@ -32,7 +33,8 @@ script: |
|
||||||
mkdir -p $INSTDIR/bin $INSTDIR/lib/wx $INSTDIR/include
|
mkdir -p $INSTDIR/bin $INSTDIR/lib/wx $INSTDIR/include
|
||||||
mkdir wxWidgets-2.9.2
|
mkdir wxWidgets-2.9.2
|
||||||
cd 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
|
cp -a bin/$GBUILD_BITS/wx/config/gtk2-unicode-static-2.9 $INSTDIR/bin/wx-config
|
||||||
for lib in wx_gtk2u wxregexu wxtiff; do
|
for lib in wx_gtk2u wxregexu wxtiff; do
|
||||||
ar rc $INSTDIR/lib/lib${lib}-2.9.a bin/$GBUILD_BITS/$lib/*.o
|
ar rc $INSTDIR/lib/lib${lib}-2.9.a bin/$GBUILD_BITS/$lib/*.o
|
||||||
|
|
|
@ -38,5 +38,5 @@ script: |
|
||||||
cd $TMPDIR
|
cd $TMPDIR
|
||||||
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
|
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
|
||||||
export FAKETIME=$REFERENCE_DATETIME
|
export FAKETIME=$REFERENCE_DATETIME
|
||||||
zip -r wxWidgets-2.9.2-gitian.zip *
|
zip -r wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip *
|
||||||
cp wxWidgets-2.9.2-gitian.zip $OUTDIR
|
cp wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip $OUTDIR
|
||||||
|
|
Loading…
Reference in a new issue