0002-make-natpmp-miniupnpc-configurable.patch (2917B)
1 From b8390696d81f66109560d12046bb63b9704e07f3 Mon Sep 17 00:00:00 2001 2 From: Moritz Warning <moritzwarning@web.de> 3 Date: Sun, 19 Mar 2017 01:14:10 +0100 4 Subject: [PATCH 2/2] make natpmp/miniupnpc configurable 5 6 also include staging_dir variable in the search paths 7 --- 8 make-linux.mk | 32 ++++++++++++++++++-------------- 9 1 file changed, 18 insertions(+), 14 deletions(-) 10 11 diff --git a/make-linux.mk b/make-linux.mk 12 index 508d8c42..36060857 100644 13 --- a/make-linux.mk 14 +++ b/make-linux.mk 15 @@ -22,20 +22,24 @@ OBJS+=ext/http-parser/http_parser.o 16 # Auto-detect miniupnpc and nat-pmp as well and use system libs if present, 17 # otherwise build into binary as done on Mac and Windows. 18 OBJS+=osdep/PortMapper.o 19 -DEFS+=-DZT_USE_MINIUPNPC 20 -MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' /usr/include/miniupnpc/miniupnpc.h && echo 1) 21 -ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1) 22 - DEFS+=-DZT_USE_SYSTEM_MINIUPNPC 23 - LDLIBS+=-lminiupnpc 24 -else 25 - DEFS+=-DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING=\"Linux\" -DMINIUPNPC_VERSION_STRING=\"2.0\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR 26 - OBJS+=ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o 27 -endif 28 -ifeq ($(wildcard /usr/include/natpmp.h),) 29 - OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o 30 -else 31 - LDLIBS+=-lnatpmp 32 - DEFS+=-DZT_USE_SYSTEM_NATPMP 33 + 34 +ifeq ($(ZT_ENABLE_PORTMAPPING),1) 35 + DEFS+=-DZT_USE_MINIUPNPC 36 + MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' $(STAGING_DIR)/usr/include/miniupnpc/miniupnpc.h && echo 1) 37 + ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1) 38 + DEFS+=-DZT_USE_SYSTEM_MINIUPNPC 39 + LDLIBS+=-lminiupnpc 40 + else 41 + DEFS+=-DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING=\"Linux\" -DMINIUPNPC_VERSION_STRING=\"2.0\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR 42 + OBJS+=ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o 43 + endif 44 + 45 + ifeq ($(wildcard $(STAGING_DIR)/usr/include/natpmp.h),) 46 + OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o 47 + else 48 + LDLIBS+=-lnatpmp 49 + DEFS+=-DZT_USE_SYSTEM_NATPMP 50 + endif 51 endif 52 53 ifeq ($(ZT_ENABLE_CLUSTER),1) 54 -- 55 2.12.0 56