zerotier: Allow building with older GCC 4.8
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 19 Jun 2017 03:00:51 +0000 (20:00 -0700)
committerFlorian Fainelli <f.fainelli@gmail.com>
Mon, 19 Jun 2017 03:08:26 +0000 (20:08 -0700)
ZeroTier builds fine with GCC 4.8, so relax the check to make that
possible.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
net/zerotier/Makefile
net/zerotier/patches/0003-gcc48.patch [new file with mode: 0644]

index 6284f1038a025a434d46fb4a1d1b48a4e2766d5c..15cf30ce0b840646de215ea23b8cac4bdd748fc3 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zerotier
 PKG_VERSION:=1.2.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=GPL-3.0
 
diff --git a/net/zerotier/patches/0003-gcc48.patch b/net/zerotier/patches/0003-gcc48.patch
new file mode 100644 (file)
index 0000000..766dd57
--- /dev/null
@@ -0,0 +1,13 @@
+Index: ZeroTierOne-1.2.4/ext/json/json.hpp
+===================================================================
+--- ZeroTierOne-1.2.4.orig/ext/json/json.hpp
++++ ZeroTierOne-1.2.4/ext/json/json.hpp
+@@ -64,7 +64,7 @@ SOFTWARE.
+     #endif
+ #elif defined(__GNUC__)
+     #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+-    #if GCC_VERSION < 40900
++    #if GCC_VERSION < 40800
+         #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+     #endif
+ #endif