From: Eneas U de Queiroz <redacted>
Date: Wed, 24 Feb 2021 18:37:59 +0000 (-0300)
Subject: docker: fix build with golang 1.16
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5b2d0609c7ab0698c2fa138d664847195b0b452f;p=openwrt-packages.git

docker: fix build with golang 1.16

Add GO111MODULE=auto to GO_PKG_BUILD_VARS to allow the package to be
built in non-module mode.

Module-aware mode will be mandatory in the next golang release.

Signed-off-by: Eneas U de Queiroz <redacted>
---

diff --git a/utils/docker/Makefile b/utils/docker/Makefile
index 0d8af6dfd..4fa3cd21a 100644
--- a/utils/docker/Makefile
+++ b/utils/docker/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=docker
 PKG_VERSION:=20.10.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
@@ -34,6 +34,7 @@ define Package/docker/description
 The CLI used in the Docker CE and Docker EE products.
 endef
 
+GO_PKG_BUILD_VARS += GO111MODULE=auto
 TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
 TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)