diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-07-05 18:21:35 +0200 |
|---|---|---|
| committer | Matt Corallo <matt@bluematt.me> | 2011-07-05 18:21:35 +0200 |
| commit | 09923991e58e3c7f92cbcf1a7cf89a8bd5304d15 (patch) | |
| tree | 18a1a0375e7d98ab7ff0bc9ce30c56a98e0ffdaa | |
| parent | 3f0950ea019ad43c2a8fc79c2aa61845003bd4dc (diff) | |
Enable UPnP by default on bitcoin, but not on bitcoind (on gitian)
Also fix a minor type in gitian.yml
| -rw-r--r-- | contrib/gitian-win32.yml | 3 | ||||
| -rw-r--r-- | contrib/gitian.yml | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/gitian-win32.yml b/contrib/gitian-win32.yml index 0c804af3d1..07d31c717e 100644 --- a/contrib/gitian-win32.yml +++ b/contrib/gitian-win32.yml @@ -74,7 +74,8 @@ script: | cd src sed 's/$(DEBUGFLAGS)//' < makefile.linux-mingw > makefile.linux-mingw.2 && mv makefile.linux-mingw.2 makefile.linux-mingw sed 's|//#include <WSPiApi.h>|#include <WSPiApi.h>|' < net.cpp > net.cpp.2 && mv net.cpp.2 net.cpp - make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoin.exe bitcoind.exe + make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoin.exe USE_UPNP=1 + make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_UPNP=0 i586-mingw32msvc-strip bitcoin.exe i586-mingw32msvc-strip bitcoind.exe makensis ../share/setup.nsi diff --git a/contrib/gitian.yml b/contrib/gitian.yml index cff4cce22b..90be8934fa 100644 --- a/contrib/gitian.yml +++ b/contrib/gitian.yml @@ -6,7 +6,7 @@ architectures: - "i386" - "amd64" packages: -- "libdb4.7++-dev +- "libdb4.7++-dev" - "libxxf86vm-dev" - "libgtk2.0-dev" - "libboost-all-dev" @@ -51,6 +51,7 @@ script: | 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 + PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin USE_UPNP=1 + PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 mkdir -p $OUTDIR/bin/$GBUILD_BITS install -s bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS |