From 998bbd73e425f49623fedad5e70a41882ba77ff1 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 8 Feb 2019 16:23:40 +0100
Subject: wireguard-go-bridge: Cache go tarballs

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 wireguard-go-bridge/.gitignore |  3 +++
 wireguard-go-bridge/Makefile   | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 wireguard-go-bridge/.gitignore

(limited to 'wireguard-go-bridge')

diff --git a/wireguard-go-bridge/.gitignore b/wireguard-go-bridge/.gitignore
new file mode 100644
index 0000000..5d25f8f
--- /dev/null
+++ b/wireguard-go-bridge/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+.tmp/
+out/
diff --git a/wireguard-go-bridge/Makefile b/wireguard-go-bridge/Makefile
index 3758b1e..4484462 100644
--- a/wireguard-go-bridge/Makefile
+++ b/wireguard-go-bridge/Makefile
@@ -29,7 +29,8 @@ version-header: $(DESTDIR)/wireguard-go-version.h
 GOBUILDARCH := $(GOARCH_$(shell uname -m))
 GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 GOBUILDVERSION := 1.11.5
-GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz
+GOBUILDTARBALL := go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz
+GOBUILDTARBALLURL := https://dl.google.com/go/$(GOBUILDTARBALL)
 GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH)
 export GOROOT := $(BUILDDIR)/goroot
 export GOPATH := $(BUILDDIR)/gopath
@@ -38,10 +39,14 @@ GOBUILDVERSION_CURRENT := $(shell $(GOROOT)/bin/go version 2>/dev/null)
 ifneq ($(GOBUILDVERSION_NEEDED),$(GOBUILDVERSION_CURRENT))
 $(shell rm -f $(GOROOT)/bin/go)
 endif
-$(GOROOT)/bin/go:
+.cache/$(GOBUILDTARBALL):
+	mkdir -p $(dir $@)
+	curl -o $@ $(GOBUILDTARBALLURL) || { rm -f $@; exit 1; }
+
+$(GOROOT)/bin/go: .cache/$(GOBUILDTARBALL)
 	rm -rf "$(GOROOT)"
 	mkdir -p "$(GOROOT)"
-	curl "$(GOBUILDTARBALL)" | tar -C "$(GOROOT)" --strip-components=1 -xzf - || { rm -rf "$(GOROOT)"; exit 1; }
+	tar -C "$(GOROOT)" --strip-components=1 -xzf - < .cache/$(GOBUILDTARBALL) || { rm -rf "$(GOROOT)"; exit 1; }
 	patch -p1 -f -N -r- -d "$(GOROOT)" < goruntime-boottime-over-monotonic.diff || { rm -rf "$(GOROOT)"; exit 1; }
 
 $(shell test "$$(cat "$(BUILDDIR)/.gobuildversion" 2>/dev/null)" = "$(GOBUILDVERSION_CURRENT)" || rm -f "$(DESTDIR)/libwg-go.a")
@@ -84,6 +89,9 @@ $(DESTDIR)/libwg-go.a: $(foreach ARCH,$(ARCHS),$(BUILDDIR)/libwg-go-$(ARCH).a)
 clean:
 	rm -rf "$(BUILDDIR)" "$(DESTDIR)/libwg-go.a" "$(DESTDIR)/wireguard-go-version.h"
 
+distclean: clean
+	rm -rf .cache
+
 install: build
 
-.PHONY: clean build version-header install
+.PHONY: distclean clean build version-header install
-- 
cgit v1.2.3-59-g8ed1b