Merge pull request #1431 from luke-jr/opt_ipv6
Make IPv6 support optional again (defaults to enabled)
This commit is contained in:
commit
1bcd3f26c0
6 changed files with 55 additions and 8 deletions
|
@ -2,7 +2,7 @@ TEMPLATE = app
|
||||||
TARGET = bitcoin-qt
|
TARGET = bitcoin-qt
|
||||||
VERSION = 0.6.99
|
VERSION = 0.6.99
|
||||||
INCLUDEPATH += src src/json src/qt
|
INCLUDEPATH += src src/json src/qt
|
||||||
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE USE_IPV6
|
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
|
||||||
CONFIG += no_include_pwd
|
CONFIG += no_include_pwd
|
||||||
|
|
||||||
# for boost 1.37, add -mt to the boost libraries
|
# for boost 1.37, add -mt to the boost libraries
|
||||||
|
@ -71,6 +71,18 @@ contains(FIRST_CLASS_MESSAGING, 1) {
|
||||||
DEFINES += FIRST_CLASS_MESSAGING
|
DEFINES += FIRST_CLASS_MESSAGING
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# use: qmake "USE_IPV6=1" ( enabled by default; default)
|
||||||
|
# or: qmake "USE_IPV6=0" (disabled by default)
|
||||||
|
# or: qmake "USE_IPV6=-" (not supported)
|
||||||
|
contains(USE_IPV6, -) {
|
||||||
|
message(Building without IPv6 support)
|
||||||
|
} else {
|
||||||
|
count(USE_IPV6, 0) {
|
||||||
|
USE_IPV6=1
|
||||||
|
}
|
||||||
|
DEFINES += USE_IPV6=$$USE_IPV6
|
||||||
|
}
|
||||||
|
|
||||||
contains(BITCOIN_NEED_QT_PLUGINS, 1) {
|
contains(BITCOIN_NEED_QT_PLUGINS, 1) {
|
||||||
DEFINES += BITCOIN_NEED_QT_PLUGINS
|
DEFINES += BITCOIN_NEED_QT_PLUGINS
|
||||||
QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
|
QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
|
||||||
|
|
|
@ -500,6 +500,12 @@ bool AppInit2()
|
||||||
SetLimited(net);
|
SetLimited(net);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#if defined(USE_IPV6)
|
||||||
|
#if ! USE_IPV6
|
||||||
|
else
|
||||||
|
SetLimited(NET_IPV6);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
CService addrProxy;
|
CService addrProxy;
|
||||||
bool fProxy = false;
|
bool fProxy = false;
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
DEPSDIR:=/usr/i586-mingw32msvc
|
DEPSDIR:=/usr/i586-mingw32msvc
|
||||||
|
|
||||||
USE_UPNP:=0
|
USE_UPNP:=0
|
||||||
|
USE_IPV6:=1
|
||||||
|
|
||||||
INCLUDEPATHS= \
|
INCLUDEPATHS= \
|
||||||
-I"$(CURDIR)" \
|
-I"$(CURDIR)" \
|
||||||
|
@ -28,18 +29,25 @@ LIBS= \
|
||||||
-l ssl \
|
-l ssl \
|
||||||
-l crypto
|
-l crypto
|
||||||
|
|
||||||
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6
|
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
||||||
DEBUGFLAGS=-g
|
DEBUGFLAGS=-g
|
||||||
CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||||
|
|
||||||
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
||||||
|
|
||||||
ifdef USE_UPNP
|
ifndef USE_UPNP
|
||||||
|
override USE_UPNP = -
|
||||||
|
endif
|
||||||
|
ifneq (${USE_UPNP}, -)
|
||||||
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
|
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
|
||||||
LIBS += -l miniupnpc -l iphlpapi
|
LIBS += -l miniupnpc -l iphlpapi
|
||||||
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
|
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (${USE_IPV6}, -)
|
||||||
|
DEFS += -DUSE_IPV6=$(USE_IPV6)
|
||||||
|
endif
|
||||||
|
|
||||||
LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
|
LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
|
||||||
|
|
||||||
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
|
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
USE_UPNP:=0
|
USE_UPNP:=0
|
||||||
|
USE_IPV6:=1
|
||||||
|
|
||||||
INCLUDEPATHS= \
|
INCLUDEPATHS= \
|
||||||
-I"C:\boost-1.49.0-mgw" \
|
-I"C:\boost-1.49.0-mgw" \
|
||||||
|
@ -23,19 +24,26 @@ LIBS= \
|
||||||
-l ssl \
|
-l ssl \
|
||||||
-l crypto
|
-l crypto
|
||||||
|
|
||||||
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6
|
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
||||||
DEBUGFLAGS=-g
|
DEBUGFLAGS=-g
|
||||||
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||||
|
|
||||||
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
||||||
|
|
||||||
ifdef USE_UPNP
|
ifndef USE_UPNP
|
||||||
|
override USE_UPNP = -
|
||||||
|
endif
|
||||||
|
ifneq (${USE_UPNP}, -)
|
||||||
INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
|
INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
|
||||||
LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
|
LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
|
||||||
LIBS += -l miniupnpc -l iphlpapi
|
LIBS += -l miniupnpc -l iphlpapi
|
||||||
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
|
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (${USE_IPV6}, -)
|
||||||
|
DEFS += -DUSE_IPV6=$(USE_IPV6)
|
||||||
|
endif
|
||||||
|
|
||||||
LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
|
LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
|
||||||
|
|
||||||
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
|
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
|
||||||
|
|
|
@ -20,6 +20,7 @@ LIBPATHS= \
|
||||||
-L"$(DEPSDIR)/lib/db48"
|
-L"$(DEPSDIR)/lib/db48"
|
||||||
|
|
||||||
USE_UPNP:=1
|
USE_UPNP:=1
|
||||||
|
USE_IPV6:=1
|
||||||
|
|
||||||
LIBS= -dead_strip
|
LIBS= -dead_strip
|
||||||
|
|
||||||
|
@ -53,7 +54,7 @@ LIBS += \
|
||||||
TESTDEFS += -DBOOST_TEST_DYN_LINK
|
TESTDEFS += -DBOOST_TEST_DYN_LINK
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6
|
DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE
|
||||||
|
|
||||||
ifdef RELEASE
|
ifdef RELEASE
|
||||||
# Compile for maximum compatibility and smallest size.
|
# Compile for maximum compatibility and smallest size.
|
||||||
|
@ -96,7 +97,10 @@ OBJS= \
|
||||||
obj/walletdb.o \
|
obj/walletdb.o \
|
||||||
obj/noui.o
|
obj/noui.o
|
||||||
|
|
||||||
ifdef USE_UPNP
|
ifndef USE_UPNP
|
||||||
|
override USE_UPNP = -
|
||||||
|
endif
|
||||||
|
ifneq (${USE_UPNP}, -)
|
||||||
DEFS += -DUSE_UPNP=$(USE_UPNP)
|
DEFS += -DUSE_UPNP=$(USE_UPNP)
|
||||||
ifdef STATIC
|
ifdef STATIC
|
||||||
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
|
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
|
||||||
|
@ -105,6 +109,10 @@ else
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (${USE_IPV6}, -)
|
||||||
|
DEFS += -DUSE_IPV6=$(USE_IPV6)
|
||||||
|
endif
|
||||||
|
|
||||||
all: bitcoind
|
all: bitcoind
|
||||||
|
|
||||||
# auto-generated dependencies:
|
# auto-generated dependencies:
|
||||||
|
|
|
@ -3,10 +3,11 @@
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
USE_UPNP:=0
|
USE_UPNP:=0
|
||||||
|
USE_IPV6:=1
|
||||||
|
|
||||||
LINK:=$(CXX)
|
LINK:=$(CXX)
|
||||||
|
|
||||||
DEFS=-DUSE_IPV6 -DBOOST_SPIRIT_THREADSAFE
|
DEFS=-DBOOST_SPIRIT_THREADSAFE
|
||||||
|
|
||||||
DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
|
DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
|
||||||
LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
|
LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
|
||||||
|
@ -43,6 +44,10 @@ ifneq (${USE_UPNP}, -)
|
||||||
DEFS += -DUSE_UPNP=$(USE_UPNP)
|
DEFS += -DUSE_UPNP=$(USE_UPNP)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (${USE_IPV6}, -)
|
||||||
|
DEFS += -DUSE_IPV6=$(USE_IPV6)
|
||||||
|
endif
|
||||||
|
|
||||||
LIBS+= \
|
LIBS+= \
|
||||||
-Wl,-B$(LMODE2) \
|
-Wl,-B$(LMODE2) \
|
||||||
-l z \
|
-l z \
|
||||||
|
|
Loading…
Reference in a new issue