0002-fix-build.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From 333bbabc6dfad0553fb63d560ab6442a50cc9e52 Mon Sep 17 00:00:00 2001
  2. From: Moritz Warning <moritzwarning@web.de>
  3. Date: Fri, 22 Jul 2016 23:27:31 +0200
  4. Subject: [PATCH 2/2] fix build
  5. ---
  6. make-linux.mk | 30 +++++++++++++++---------------
  7. 1 file changed, 15 insertions(+), 15 deletions(-)
  8. --- a/make-linux.mk
  9. +++ b/make-linux.mk
  10. @@ -39,24 +39,24 @@ include objects.mk
  11. # On Linux we auto-detect the presence of some libraries and if present we
  12. # link against the system version. This works with our package build images.
  13. -ifeq ($(wildcard /usr/include/lz4.h),)
  14. +#ifeq ($(wildcard $(STAGING_DIR)/usr/include/lz4.h),)
  15. OBJS+=ext/lz4/lz4.o
  16. -else
  17. - LDLIBS+=-llz4
  18. - DEFS+=-DZT_USE_SYSTEM_LZ4
  19. -endif
  20. -ifeq ($(wildcard /usr/include/http_parser.h),)
  21. +#else
  22. +# LDLIBS+=-llz4
  23. +# DEFS+=-DZT_USE_SYSTEM_LZ4
  24. +#endif
  25. +#ifeq ($(wildcard $(STAGING_DIR)/usr/include/http_parser.h),)
  26. OBJS+=ext/http-parser/http_parser.o
  27. -else
  28. - LDLIBS+=-lhttp_parser
  29. - DEFS+=-DZT_USE_SYSTEM_HTTP_PARSER
  30. -endif
  31. -ifeq ($(wildcard /usr/include/json-parser/json.h),)
  32. +#else
  33. +# LDLIBS+=-lhttp_parser
  34. +# DEFS+=-DZT_USE_SYSTEM_HTTP_PARSER
  35. +#endif
  36. +#ifeq ($(wildcard $(STAGING_DIR)/usr/include/json-parser/json.h),)
  37. OBJS+=ext/json-parser/json.o
  38. -else
  39. - LDLIBS+=-ljsonparser
  40. - DEFS+=-DZT_USE_SYSTEM_JSON_PARSER
  41. -endif
  42. +#else
  43. +# LDLIBS+=-ljsonparser
  44. +# DEFS+=-DZT_USE_SYSTEM_JSON_PARSER
  45. +#endif
  46. ifeq ($(ZT_USE_MINIUPNPC),1)
  47. OBJS+=osdep/PortMapper.o