mirror of
https://github.com/novatiq/packages.git
synced 2026-04-29 06:58:39 +01:00
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>
This commit is contained in:
@@ -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) \
|
||||
|
||||
@@ -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)' \
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user