redsocks: fix build on macos

fix cross-compile issues (on macos)
use $CC -dumpmachine instead of `uname`
use $CC instead of CC

Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>

diff --git a/net/redsocks/Makefile b/net/redsocks/Makefile
index fc46ea203f469db4bdb86e07977f8bd272c965b4..495477ce2bb8756f46e13c1f3380ebe402086588 100644 (file)
--- a/net/redsocks/Makefile
+++ b/net/redsocks/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=redsocks
 PKG_VERSION:=0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/darkk/redsocks/tar.gz/release-$(PKG_VERSION)?

diff --git a/net/redsocks/patches/100_use_cc_dumpmachine_instead_of_uname.patch b/net/redsocks/patches/100_use_cc_dumpmachine_instead_of_uname.patch
new file mode 100644 (file)
index 0000000..a56ca12
--- /dev/null
+++ b/net/redsocks/patches/100_use_cc_dumpmachine_instead_of_uname.patch
@@ -0,0 +1,34 @@
+From https://github.com/darkk/redsocks/pull/105
+
+commit d5cabecb6a8369fb2bd883b43205035dd87187a5
+Author: a7ypically <a7ypically@gmail.com>
+Date:   Sat Jun 3 21:33:20 2017 +0300
+
+    Update Makefile
+
+--- a/Makefile
++++ b/Makefile
+@@ -26,11 +26,11 @@ tags: *.c *.h
+       ctags -R
+ 
+ $(CONF):
+-      @case `uname` in \
+-      Linux*) \
++      @case `$(CC) -dumpmachine` in \
++      *linux*) \
+               echo "#define USE_IPTABLES" >$(CONF) \
+               ;; \
+-      OpenBSD) \
++      *openbsd*) \
+               echo "#define USE_PF" >$(CONF) \
+               ;; \
+       *) \
+@@ -66,7 +66,7 @@ gen/.build:
+ base.c: $(CONF)
+ 
+ $(DEPS): $(SRCS)
+-      gcc -MM $(SRCS) 2>/dev/null >$(DEPS) || \
++      $(CC) -MM $(SRCS) 2>/dev/null >$(DEPS) || \
+       ( \
+               for I in $(wildcard *.h); do \
+                       export $${I//[-.]/_}_DEPS="`sed '/^\#[ \t]*include \?"\(.*\)".*/!d;s//\1/' $$I`"; \