From 7c695d259aa5c9b046361e5871ba8ad55ce64cdc Mon Sep 17 00:00:00 2001 From: Nathan Bass Date: Wed, 20 Jan 2016 18:03:58 -0600 Subject: [PATCH] Set all builds to have UPNP disabled by default --- contrib/gitian-descriptors/gitian-linux.yml | 2 +- contrib/gitian-descriptors/gitian-win.yml | 2 +- paycoin-qt.pro | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 93973712..423ab07a 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -53,7 +53,7 @@ script: | install -s paycoin-qt $BINDIR cd src - make -f makefile.unix STATIC=1 $MAKEOPTS paycoind USE_UPNP=1 BDB_INCLUDE_PATH=$STAGING/include BDB_LIB_PATH=$STAGING/lib BOOST_LIB_SUFFIX=-mt DEBUGFLAGS= + make -f makefile.unix STATIC=1 $MAKEOPTS paycoind BDB_INCLUDE_PATH=$STAGING/include BDB_LIB_PATH=$STAGING/lib BOOST_LIB_SUFFIX=-mt DEBUGFLAGS= install -s paycoind $BINDIR # sort distribution tar file and normalize user/group/mtime information for deterministic output diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 1d95bee7..33af19b7 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -72,7 +72,7 @@ script: | cp -f release/paycoin.exe $BINDIR/ cd src - make -f makefile.linux-mingw $MAKEOPTS HOST=$HOST DEPSDIR=$STAGING paycoind.exe USE_UPNP=1 DEBUGFLAGS="-frandom-seed=paycoin" + make -f makefile.linux-mingw $MAKEOPTS HOST=$HOST DEPSDIR=$STAGING paycoind.exe DEBUGFLAGS="-frandom-seed=paycoin" ${HOST}-strip paycoind.exe cp -f paycoind.exe $BINDIR/ diff --git a/paycoin-qt.pro b/paycoin-qt.pro index 8a4314d0..bdffb8bb 100644 --- a/paycoin-qt.pro +++ b/paycoin-qt.pro @@ -39,8 +39,8 @@ contains(USE_QRCODE, 1) { LIBS += -lqrencode } -# use: qmake "USE_UPNP=1" ( enabled by default; default) -# or: qmake "USE_UPNP=0" (disabled by default) +# use: qmake "USE_UPNP=1" ( enabled by default) +# or: qmake "USE_UPNP=0" (disabled by default; default) # or: qmake "USE_UPNP=-" (not supported) # miniupnpc (http://miniupnp.free.fr/files/) must be installed for support contains(USE_UPNP, -) { @@ -48,7 +48,7 @@ contains(USE_UPNP, -) { } else { message(Building with UPNP support) count(USE_UPNP, 0) { - USE_UPNP=1 + USE_UPNP=0 } DEFINES += USE_UPNP=$$USE_UPNP STATICLIB INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH