diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-05-16 16:14:15 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-05-17 09:48:45 +0200 |
| commit | 4dab912edb17f2952a64ff9979980deaadbbb8c3 (patch) | |
| tree | d934ab5b18b8c1514d29ac4b83ebb149063f8cec | |
| parent | 72ebcef5be0c0734744798539cef29b43a0e0119 (diff) | |
| download | upstream-4dab912edb17f2952a64ff9979980deaadbbb8c3.tar.gz upstream-4dab912edb17f2952a64ff9979980deaadbbb8c3.tar.bz2 upstream-4dab912edb17f2952a64ff9979980deaadbbb8c3.zip | |
wireguard: bump to 20180514
52be69b version: bump snapshot
4884b45 ncat-client-server: add wg-quick variant
a333551 wg-quick: add darwin implementation
f5bf84d compat: backport for OpenSUSE 15
fe1ae1b wg-quick: add wg symlink
ecc1c5f wg-quick: add android implementation
3e6bb79 tools: reorganize for multiplatform wg-quick
b289d12 allowedips: Fix graphviz output after endianness patch
Refresh cross compile compatibility patch
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
| -rw-r--r-- | package/network/services/wireguard/Makefile | 4 | ||||
| -rw-r--r-- | package/network/services/wireguard/patches/100-portability.patch | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index 1aa8659124..5ca7b7da57 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=0.0.20180513 +PKG_VERSION:=0.0.20180514 PKG_RELEASE:=1 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ -PKG_HASH:=28a15c59f6710851587ebca76a335f1aaaa077aad052732e0959f2bae9ba8d5c +PKG_HASH:=e895b65e06e85429403be3d1987577a6967476b069f0ff53caead6f682f466da PKG_LICENSE:=GPL-2.0 Apache-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/package/network/services/wireguard/patches/100-portability.patch b/package/network/services/wireguard/patches/100-portability.patch index b26d51ebd8..33a7373cc7 100644 --- a/package/network/services/wireguard/patches/100-portability.patch +++ b/package/network/services/wireguard/patches/100-portability.patch @@ -7,12 +7,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- --- a/src/tools/Makefile +++ b/src/tools/Makefile -@@ -43,7 +43,7 @@ CFLAGS += -DRUNSTATEDIR="\"$(RUNSTATEDIR - ifeq ($(DEBUG_TOOLS),y) - CFLAGS += -g +@@ -36,6 +36,9 @@ endif endif --ifeq ($(shell uname -s),Linux) + + PLATFORM ?= $(shell uname -s | tr '[:upper:]' '[:lower:]') +ifeq ($(strip $(shell echo __linux__ | $(CC) -E - | grep -v '^\#')),1) - LIBMNL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libmnl 2>/dev/null) - LIBMNL_LDLIBS := $(shell $(PKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl) - CFLAGS += $(LIBMNL_CFLAGS) ++PLATFORM := linux ++endif + + CFLAGS ?= -O3 + CFLAGS += -std=gnu11 -D_GNU_SOURCE |