diff options
author | Matt Corallo <matt@bluematt.me> | 2011-07-03 14:41:09 +0200 |
---|---|---|
committer | Matt Corallo <matt@bluematt.me> | 2011-07-05 00:59:00 +0200 |
commit | fa105b1d3a055e076a78674b96d0e9b859dfe5b2 (patch) | |
tree | c8000f5a16fe60154c4143c66a6aab3d3f0740b5 /contrib/gitian.yml | |
parent | d547a4433217061ef4791cfb4cdbab8cd8606074 (diff) |
Added a couple minor things to match newer build process.
This adds the relevent patches which are applied to wx,
and updates for cross compiling.
Diffstat (limited to 'contrib/gitian.yml')
-rw-r--r-- | contrib/gitian.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/gitian.yml b/contrib/gitian.yml index bf9975030b..cff4cce22b 100644 --- a/contrib/gitian.yml +++ b/contrib/gitian.yml @@ -6,7 +6,7 @@ architectures: - "i386" - "amd64" packages: -- "libdb4.8++-dev" +- "libdb4.7++-dev - "libxxf86vm-dev" - "libgtk2.0-dev" - "libboost-all-dev" @@ -19,6 +19,8 @@ remotes: files: - "wxWidgets-2.9.1.tar.bz2" - "miniupnpc-1.5.tar.gz" +- "toplevel.h.diff" +- "toplevel.cpp.diff" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -30,6 +32,11 @@ script: | # tar xjf wxWidgets-2.9.1.tar.bz2 cd wxWidgets-2.9.1 + cd include/wx/gtk + patch < ../../../../toplevel.h.diff + cd ../../../src/gtk + patch < ../../../toplevel.cpp.diff + cd ../.. ./configure --prefix=$INSTDIR --enable-monolithic --disable-shared perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h make $MAKEOPTS install @@ -43,6 +50,7 @@ script: | cp $OUTDIR/src/doc/README $OUTDIR cp $OUTDIR/src/COPYING $OUTDIR cd src + sed 's/$(DEBUGFLAGS)//' < makefile.unix > makefile.unix.2 && mv makefile.unix.2 makefile.unix PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin bitcoind mkdir -p $OUTDIR/bin/$GBUILD_BITS install -s bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS |