You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

28 lines
601 B

  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. make-linux.mk | 3 ++-
  7. 1 file changed, 2 insertions(+), 1 deletion(-)
  8. diff --git a/make-linux.mk b/make-linux.mk
  9. index 7c77f58f..508d8c42 100644
  10. --- a/make-linux.mk
  11. +++ b/make-linux.mk
  12. @@ -8,9 +8,10 @@ ifeq ($(origin CXX),default)
  13. endif
  14. INCLUDES?=
  15. -DEFS?=-D_FORTIFY_SOURCE=2
  16. +DEFS?=
  17. LDLIBS?=
  18. DESTDIR?=
  19. +ZT_ENABLE_PORTMAPPING?=0
  20. include objects.mk
  21. --
  22. 2.12.0