[OpenWrt-Devel] [PATCH v2] wireguard: no longer need portability patch

[Kevin Darbyshire-Bryant]

Drop package/network/services/wireguard/patches/100-portability.patch

Instead pass 'PLATFORM=linux' to make since we are always building FOR
linux.

Signed-off-by: Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
---

V2 - actually I don't need to bump the package version as this doesn't
really change anything in the binary sense

 package/network/services/wireguard/Makefile           |  1 +
 .../services/wireguard/patches/100-portability.patch  | 19 -------------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 package/network/services/wireguard/patches/100-portability.patch

diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile
index 5ca7b7da57..770efe4948 100644
--- a/package/network/services/wireguard/Makefile
+++ b/package/network/services/wireguard/Makefile
@@ -60,6 +60,7 @@ include $(INCLUDE_DIR)/package-defaults.mk
 
 # Used by Build/Compile/Default
 MAKE_PATH:=src/tools
+MAKE_VARS += PLATFORM=linux
 
 define Build/Compile
 	$(MAKE) $(KERNEL_MAKEOPTS) M="$(PKG_BUILD_DIR)/src" modules
diff --git a/package/network/services/wireguard/patches/100-portability.patch b/package/network/services/wireguard/patches/100-portability.patch
deleted file mode 100644
index 33a7373cc7..0000000000
--- a/package/network/services/wireguard/patches/100-portability.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-tools: fix portability issue
-
-Check if the compiler defines __linux__, instead of assuming that the
-host OS is the same as the target OS.
-
-Signed-off-by: Felix Fietkau <nbd at nbd.name>
----
---- a/src/tools/Makefile
-+++ b/src/tools/Makefile
-@@ -36,6 +36,9 @@ endif
- endif
- 
- PLATFORM ?= $(shell uname -s | tr '[:upper:]' '[:lower:]')
-+ifeq ($(strip $(shell echo __linux__ | $(CC) -E - | grep -v '^\#')),1)
-+PLATFORM := linux
-+endif
- 
- CFLAGS ?= -O3
- CFLAGS += -std=gnu11 -D_GNU_SOURCE
-- 
2.15.1 (Apple Git-101)


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
http://lists.infradead.org/mailman/listinfo/openwrt-devel