From d2f5e6966b04f71e31e6fc8fbc02c096513fe284 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Wed, 13 May 2020 00:05:18 +0800
Subject: [PATCH] golang: Rename GoPackage/Environment to GO_PKG_VARS

The variable is a list of shell variables; the new name is more in-line
with other parts the build system (CONFIGURE_VARS, MAKE_VARS, etc.).

GoPackage/Environment is kept (for now) in case other feeds are using
it.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---
 lang/golang/golang-package.mk | 20 ++++++++++----------
 lang/golang/golang/Makefile   |  2 +-
 utils/containerd/Makefile     |  2 +-
 utils/docker-ce/Makefile      |  2 +-
 utils/runc/Makefile           |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk
index de7ef336d5..f336a84513 100644
--- a/lang/golang/golang-package.mk
+++ b/lang/golang/golang-package.mk
@@ -160,7 +160,7 @@ define GoPackage/GoSubMenu
   CATEGORY:=Languages
 endef
 
-define GoPackage/Environment/Target
+GO_PKG_TARGET_VARS= \
 	GOOS=$(GO_OS) \
 	GOARCH=$(GO_ARCH) \
 	GO386=$(GO_386) \
@@ -174,20 +174,20 @@ define GoPackage/Environment/Target
 	CGO_CPPFLAGS="$(TARGET_CPPFLAGS)" \
 	CGO_CXXFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CXXFLAGS))" \
 	CGO_LDFLAGS="$(TARGET_LDFLAGS)"
-endef
 
-define GoPackage/Environment/Build
+GO_PKG_BUILD_VARS= \
 	GOPATH=$(GO_PKG_BUILD_DIR) \
 	GOCACHE=$(GO_PKG_CACHE_DIR) \
 	GOENV=off
-endef
 
-define GoPackage/Environment/Default
-	$(call GoPackage/Environment/Target) \
-	$(call GoPackage/Environment/Build)
-endef
+GO_PKG_DEFAULT_VARS= \
+	$(GO_PKG_TARGET_VARS) \
+	$(GO_PKG_BUILD_VARS)
 
-GoPackage/Environment=$(call GoPackage/Environment/Default)
+GO_PKG_VARS=$(GO_PKG_DEFAULT_VARS)
+
+# do not use for new code; this will be removed after the next OpenWrt release
+GoPackage/Environment=$(GO_PKG_VARS)
 
 # false if directory does not exist
 GoPackage/is_dir_not_empty=$$$$($(FIND) $(1) -maxdepth 0 -type d \! -empty 2>/dev/null)
@@ -273,7 +273,7 @@ endef
 define GoPackage/Build/Compile
 	( \
 		cd $(GO_PKG_BUILD_DIR) ; \
-		export $(call GoPackage/Environment) ; \
+		export $(GO_PKG_VARS) ; \
 		\
 		echo "Finding targets" ; \
 		targets=$$$$(go list $(GO_PKG_BUILD_PKG)) ; \
diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile
index 25d1904a62..21e261b1cc 100644
--- a/lang/golang/golang/Makefile
+++ b/lang/golang/golang/Makefile
@@ -310,7 +310,7 @@ define Build/Compile
 
 	( \
 		cd $(PKG_BUILD_DIR)/bin ; \
-		export $(call GoPackage/Environment/Target) ; \
+		export $(GO_PKG_TARGET_VARS) ; \
 		$(CP) go go-host ; \
 		GOROOT_FINAL=$(PKG_GO_ROOT) \
 		GOCACHE=$(PKG_GO_TARGET_CACHE_DIR) \
diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile
index 3da8c8cb35..9afce54200 100644
--- a/utils/containerd/Makefile
+++ b/utils/containerd/Makefile
@@ -49,7 +49,7 @@ endef
 
 GO_PKG_INSTALL_ALL:=1
 MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG)
-MAKE_VARS += $(call GoPackage/Environment)
+MAKE_VARS += $(GO_PKG_VARS)
 MAKE_FLAGS += \
 	DESTDIR="$(PKG_INSTALL_DIR)" \
 	VERSION=$(PKG_VERSION) \
diff --git a/utils/docker-ce/Makefile b/utils/docker-ce/Makefile
index a8735fcc7c..0305a132f1 100644
--- a/utils/docker-ce/Makefile
+++ b/utils/docker-ce/Makefile
@@ -78,7 +78,7 @@ endif
 
 define Build/Compile
 	( \
-		export $(call GoPackage/Environment) \
+		export $(GO_PKG_VARS) \
 			GITCOMMIT=$(PKG_SOURCE_VERSION) \
 			DOCKER_GITCOMMIT=$(PKG_SOURCE_VERSION) \
 			DOCKER_BUILDTAGS='$(BUILDTAGS)' \
diff --git a/utils/runc/Makefile b/utils/runc/Makefile
index eef25fa8eb..605b852b7d 100644
--- a/utils/runc/Makefile
+++ b/utils/runc/Makefile
@@ -49,7 +49,7 @@ endef
 
 GO_PKG_INSTALL_ALL:=1
 MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG)
-MAKE_VARS += $(call GoPackage/Environment)
+MAKE_VARS += $(GO_PKG_VARS)
 MAKE_FLAGS += \
 	COMMIT=$(PKG_SOURCE_VERSION)