KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wireguard: bump to 20180514

Browse source 
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>
This commit is contained in:
Kevin Darbyshire-Bryant 2018-05-16 16:14:15 +01:00 committed by Hans Dedecker
parent e9cb1b720d
commit 4ff23afdcc
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/network/services/wireguard/Makefile
View file

@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=wireguard PKG_NAME:=wireguard
PKG_VERSION:=0.0.20180513 PKG_VERSION:=0.0.20180514
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ 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:=GPL-2.0 Apache-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING

15
package/network/services/wireguard/patches/100-portability.patch
View file

@ -7,12 +7,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- ---
--- a/src/tools/Makefile --- a/src/tools/Makefile
+++ b/src/tools/Makefile +++ b/src/tools/Makefile
@@ -43,7 +43,7 @@ CFLAGS += -DRUNSTATEDIR="\"$(RUNSTATEDIR @@ -36,6 +36,9 @@ endif
ifeq ($(DEBUG_TOOLS),y)
CFLAGS += -g
endif endif
-ifeq ($(shell uname -s),Linux)
PLATFORM ?= $(shell uname -s | tr '[:upper:]' '[:lower:]')
+ifeq ($(strip $(shell echo __linux__ | $(CC) -E - | grep -v '^\#')),1) +ifeq ($(strip $(shell echo __linux__ | $(CC) -E - | grep -v '^\#')),1)
LIBMNL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libmnl 2>/dev/null) +PLATFORM := linux
LIBMNL_LDLIBS := $(shell $(PKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl) +endif
CFLAGS += $(LIBMNL_CFLAGS)
CFLAGS ?= -O3
CFLAGS += -std=gnu11 -D_GNU_SOURCE