net/zerotier/patches/0001-fix-makefile.patch

   1 From 2c513f0db50eaee5623d58ac024d62142f4ac782 Mon Sep 17 00:00:00 2001
   2 From: Moritz Warning <moritzwarning@web.de>
   3 Date: Mon, 4 Jul 2022 00:09:24 +0200
   4 Subject: [PATCH 1/2] fix makefile
   5
   6 ---
   7  make-linux.mk | 14 +++++++-------
   8  1 file changed, 7 insertions(+), 7 deletions(-)
   9
  10 --- a/make-linux.mk
  11 +++ b/make-linux.mk
  12 @@ -25,8 +25,8 @@ TIMESTAMP=$(shell date +"%Y%m%d%H%M")
  13  # otherwise build into binary as done on Mac and Windows.
  14  ONE_OBJS+=osdep/PortMapper.o
  15  override DEFS+=-DZT_USE_MINIUPNPC
  16 -MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2..*"' /usr/include/miniupnpc/miniupnpc.h && echo 1)
  17 -#MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' /usr/include/miniupnpc/miniupnpc.h && echo 1)
  18 +MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2..*"' $(STAGING_DIR)/usr/include/miniupnpc/miniupnpc.h && echo 1)
  19 +#MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' $(STAGING_DIR)/usr/include/miniupnpc/miniupnpc.h && echo 1)
  20  ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
  21         override DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
  22         LDLIBS+=-lminiupnpc
  23 @@ -34,7 +34,7 @@ else
  24         override 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
  25         ONE_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
  26  endif
  27 -ifeq ($(wildcard /usr/include/natpmp.h),)
  28 +ifeq ($(wildcard $(STAGING_DIR)/usr/include/natpmp.h),)
  29         ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
  30  else
  31         LDLIBS+=-lnatpmp
  32 @@ -70,7 +70,7 @@ else
  33         override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
  34         CXXFLAGS?=-O3 -fstack-protector
  35         override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
  36 -       LDFLAGS=-pie -Wl,-z,relro,-z,now
  37 +       LDFLAGS=-Wl,-z,relro,-z,now
  38         RUSTFLAGS=--release
  39  endif
  40
  41 @@ -316,7 +316,7 @@ ifeq ($(ZT_CONTROLLER),1)
  42  endif
  43
  44  # ARM32 hell -- use conservative CFLAGS
  45 -ifeq ($(ZT_ARCHITECTURE),3)
  46 +ifeq (0,3)
  47         ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
  48                 override CFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
  49                 override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
  50 @@ -343,8 +343,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1)
  51  endif
  52
  53  # Position Independence
  54 -override CFLAGS+=-fPIC -fPIE
  55 -override CXXFLAGS+=-fPIC -fPIE
  56 +#override CFLAGS+=-fPIC -fPIE
  57 +#override CXXFLAGS+=-fPIC -fPIE
  58
  59  .PHONY: all
  60  all:   one