diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-08-18 09:11:12 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-08-18 13:34:48 +0200 |
| commit | 1c78088361a84214b156e62ffd2551683e446351 (patch) | |
| tree | 1d3e587a6055cf5bb0a60e56e7ddd7ee4950cd61 | |
| parent | build: update to go 1.15 (diff) | |
| download | wireguard-windows-1c78088361a84214b156e62ffd2551683e446351.tar.xz wireguard-windows-1c78088361a84214b156e62ffd2551683e446351.zip | |
build: re-add patcher
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | build.bat | 4 |
2 files changed, 15 insertions, 4 deletions
@@ -5,7 +5,7 @@ export CGO_LDFLAGS := -Wl,--dynamicbase -Wl,--nxcompat -Wl,--export-all-symbols export GOOS := windows rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) -SOURCE_FILES := $(call rwildcard,,*.go *.c *.h) go.mod go.sum +SOURCE_FILES := $(call rwildcard,,*.go *.c *.h) .deps/prepared go.mod go.sum RESOURCE_FILES := resources.rc version/version.h manifest.xml $(patsubst %.svg,%.ico,$(wildcard ui/icon/*.svg)) DEPLOYMENT_HOST ?= winvm @@ -13,6 +13,13 @@ DEPLOYMENT_PATH ?= Desktop all: amd64/wireguard.exe x86/wireguard.exe +.deps/prepared: $(wildcard go-patches/*.patch) + rm -rf .deps && mkdir -p .deps + if ! rsync --exclude=pkg/obj/go-build/trim.txt -aqL $$(go env GOROOT)/ .deps/goroot; then chmod -R +w .deps/goroot; exit 1; fi + chmod -R +w .deps/goroot + cat $^ | patch -f -N -r- -p1 -d .deps/goroot + touch $@ + %.ico: %.svg convert -background none $< -define icon:auto-resize="256,192,128,96,64,48,32,24,16" $@ @@ -26,12 +33,12 @@ amd64/wireguard.exe: export CC := x86_64-w64-mingw32-gcc amd64/wireguard.exe: export GOARCH := amd64 amd64/wireguard.exe: CGO_LDFLAGS += -Wl,--high-entropy-va amd64/wireguard.exe: resources_amd64.syso $(SOURCE_FILES) - go build $(GOFLAGS) -o $@ + GOROOT="$(CURDIR)/.deps/goroot" go build $(GOFLAGS) -o $@ x86/wireguard.exe: export CC := i686-w64-mingw32-gcc x86/wireguard.exe: export GOARCH := 386 x86/wireguard.exe: resources_386.syso $(SOURCE_FILES) - go build $(GOFLAGS) -o $@ + GOROOT="$(CURDIR)/.deps/goroot" go build $(GOFLAGS) -o $@ remaster: export CC := x86_64-w64-mingw32-gcc remaster: export GOARCH := amd64 @@ -63,6 +70,6 @@ deploy: amd64/wireguard.exe scp $< $(DEPLOYMENT_HOST):$(DEPLOYMENT_PATH) clean: - rm -rf *.syso ui/icon/*.ico x86/ amd64/ + rm -rf *.syso ui/icon/*.ico x86/ amd64/ .deps .PHONY: deploy clean fmt remaster generate all @@ -23,6 +23,10 @@ if exist .deps\prepared goto :render rem Mirror of https://sourceforge.net/projects/ezwinports/files/make-4.2.1-without-guile-w32-bin.zip call :download make.zip https://download.wireguard.com/windows-toolchain/distfiles/make-4.2.1-without-guile-w32-bin.zip 30641be9602712be76212b99df7209f4f8f518ba764cf564262bc9d6e4047cc7 "--strip-components 1 bin" || goto :error call :download wireguard-tools.zip https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200319.zip f0f186924b67696e5dac6020270b0ac27fd7d96b4976605d1cded405d27b2f54 "--exclude wg-quick --strip-components 1" || goto :error + rem Mirror of https://sourceforge.net/projects/gnuwin32/files/patch/2.5.9-7/patch-2.5.9-7-bin.zip with fixed manifest + call :download patch.zip https://download.wireguard.com/windows-toolchain/distfiles/patch-2.5.9-7-bin-fixed-manifest.zip 25977006ca9713f2662a5d0a2ed3a5a138225b8be3757035bd7da9dcf985d0a1 "--strip-components 1 bin" || goto :error + echo [+] Patching go + for %%a in ("..\go-patches\*.patch") do .\patch.exe -f -N -r- -d go -p1 --binary < "%%a" || goto :error copy /y NUL prepared > NUL || goto :error cd .. || goto :error |