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.

27 lines
1.2 KiB

  1. From c578216351a4daa3916265b39b14f7c23ef15c90 Mon Sep 17 00:00:00 2001
  2. From: Moritz Warning <moritzwarning@web.de>
  3. Date: Mon, 23 Apr 2018 22:12:31 +0200
  4. Subject: [PATCH 1/4] find miniupnpc.h in staging directory
  5. ---
  6. make-linux.mk | 4 ++--
  7. 1 file changed, 2 insertions(+), 2 deletions(-)
  8. diff --git a/make-linux.mk b/make-linux.mk
  9. index 2e6a8632..0cd955d1 100644
  10. --- a/make-linux.mk
  11. +++ b/make-linux.mk
  12. @@ -22,8 +22,8 @@ ONE_OBJS+=osdep/LinuxEthernetTap.o
  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. --
  24. 2.17.0