Skip to content

redsocks: fix build on macos #17581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neheb merged 1 commit into from
Jan 18, 2022
Merged

redsocks: fix build on macos #17581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/redsocks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?
Expand Down
34 changes: 34 additions & 0 deletions net/redsocks/patches/100_use_cc_dumpmachine_instead_of_uname.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`"; \