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>
This commit is contained in:
parent
ec252c20cc
commit
5cd8b75f94
2 changed files with 35 additions and 1 deletions
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=redsocks
|
PKG_NAME:=redsocks
|
||||||
PKG_VERSION:=0.5
|
PKG_VERSION:=0.5
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/darkk/redsocks/tar.gz/release-$(PKG_VERSION)?
|
PKG_SOURCE_URL:=https://codeload.github.com/darkk/redsocks/tar.gz/release-$(PKG_VERSION)?
|
||||||
|
|
|
@ -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`"; \
|
Loading…
Reference in a new issue