diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-05-17 23:08:21 +0100 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2018-05-25 09:30:43 +0800 |
| commit | 5ad80ff24b27d24c1e86eff5df4c6b90a57cdf1b (patch) | |
| tree | 8ea1af8e27748ffef876f7b93d679ed7dd6f047f | |
| parent | 83089916dcc3e29764a81d67e1c2457e170dad65 (diff) | |
| download | upstream-5ad80ff24b27d24c1e86eff5df4c6b90a57cdf1b.tar.gz upstream-5ad80ff24b27d24c1e86eff5df4c6b90a57cdf1b.tar.bz2 upstream-5ad80ff24b27d24c1e86eff5df4c6b90a57cdf1b.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>
| -rw-r--r-- | package/network/services/wireguard/Makefile | 1 | ||||
| -rw-r--r-- | package/network/services/wireguard/patches/100-portability.patch | 19 |
2 files changed, 1 insertions, 19 deletions
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@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 |