aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2018-05-17 23:08:21 +0100
committerJohn Crispin <john@phrozen.org>2018-05-24 17:24:30 +0200
commit09cb0a5626b53b7be3923c6af18de675461cea8c (patch)
tree9b23c34b2e37382069225f9cf2708ba165d59387
parent0f35193aecff47bb7a233a1123c87c1b8a9b2a04 (diff)
downloadupstream-09cb0a5626b53b7be3923c6af18de675461cea8c.tar.gz
upstream-09cb0a5626b53b7be3923c6af18de675461cea8c.tar.bz2
upstream-09cb0a5626b53b7be3923c6af18de675461cea8c.zip
wireguard: no longer need portability patch
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@darbyshire-bryant.me.uk> (cherry picked from commit f06def4221c25f4ee43d31c2b90a1371ba4d6d33)
-rw-r--r--package/network/services/wireguard/Makefile1
-rw-r--r--package/network/services/wireguard/patches/100-portability.patch19
2 files changed, 1 insertions, 19 deletions
diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile
index 0d4a3a7c5d..c9ade769a6 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@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