Merge pull request #4326 from chris5560/master
[feed/packages.git] / net / zerotier / patches / 0001-prevent-D_FORTIFY_SOURCE-from-being-defined-twice.patch
1 From 4fd495fca8417a8fd4405951d1eee80f345eaf9b Mon Sep 17 00:00:00 2001
2 From: Moritz Warning <moritzwarning@web.de>
3 Date: Sun, 19 Mar 2017 01:13:14 +0100
4 Subject: [PATCH 1/2] prevent D_FORTIFY_SOURCE from being defined twice
5
6 ---
7 make-linux.mk | 3 ++-
8 1 file changed, 2 insertions(+), 1 deletion(-)
9
10 diff --git a/make-linux.mk b/make-linux.mk
11 index 7c77f58f..508d8c42 100644
12 --- a/make-linux.mk
13 +++ b/make-linux.mk
14 @@ -8,9 +8,10 @@ ifeq ($(origin CXX),default)
15 endif
16
17 INCLUDES?=
18 -DEFS?=-D_FORTIFY_SOURCE=2
19 +DEFS?=
20 LDLIBS?=
21 DESTDIR?=
22 +ZT_ENABLE_PORTMAPPING?=0
23
24 include objects.mk
25
26 --
27 2.12.0
28