[Buildroot] [PATCH 3/6] package/go: make host package a virtual package
Thomas Perale
thomas.perale at essensium.com
Wed Oct 4 14:22:59 UTC 2023
From: Thomas Perale <thomas.perale at mind.be>
Turn host-go into a virtual package, which has two providers:
- host-go-src, which build host-go from source based on the same logic
that was previously used in package/go/go/go.mk, now moved in
package/go/go-src/go-src.mk to remove any ambiguity on the role of
the package.
- host-go-bin, which will be introduced in the next commit and installs
a pre-built Go compiler.
The usage of a virtual package enables the support for pre-built Go
compiler which reduce the build time for of host-go.
A similar solution is proposed for host-rust.
By default, host-go is built from sources to keep the same behaviour as
the former version.
Signed-off-by: Thomas Perale <thomas.perale at mind.be>
---
.checkpackageignore | 2 +-
package/go/Config.in.host | 32 +++++++++++++++++++
...explicit-option-for-crosscompilation.patch | 0
...ldvcs-false-when-building-go-bootstr.patch | 0
package/go/{go/go.hash => go-src/go-src.hash} | 0
package/go/{go/go.mk => go-src/go-src.mk} | 25 ++++++++-------
package/go/go.mk | 2 ++
7 files changed, 48 insertions(+), 13 deletions(-)
rename package/go/{go => go-src}/0001-build.go-explicit-option-for-crosscompilation.patch (100%)
rename package/go/{go => go-src}/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch (100%)
rename package/go/{go/go.hash => go-src/go-src.hash} (100%)
rename package/go/{go/go.mk => go-src/go-src.mk} (68%)
diff --git a/.checkpackageignore b/.checkpackageignore
index becaf6a9fc..ca4b2a8afb 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -514,7 +514,7 @@ package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream
package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream
package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch Upstream
package/gnuplot/0001-configure-add-without-demo-option.patch Upstream
-package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch Upstream
+package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch Upstream
package/gob2/0001-dont-include-from-prefix.patch Upstream
package/gobject-introspection/0001-disable-tests.patch Upstream
package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch Upstream
diff --git a/package/go/Config.in.host b/package/go/Config.in.host
index 277d75e2b6..742d484420 100644
--- a/package/go/Config.in.host
+++ b/package/go/Config.in.host
@@ -32,5 +32,37 @@ config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS
default y
depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS
+config BR2_PACKAGE_HOST_GO
+ bool "host go compiler"
+ depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS
+ help
+ Compiler for the Go language
+
+ https://go.dev
+
+if BR2_PACKAGE_HOST_GO
+
+choice
+ prompt "Go compiler variant"
+ default BR2_PACKAGE_HOST_GO_SRC
+ help
+ Select a Go compiler variant.
+
+ Default to 'host-go-src'.
+
+config BR2_PACKAGE_HOST_GO_SRC
+ bool "host go (source)"
+ help
+ This package will build the go compiler for the host.
+
+endchoice
+
+config BR2_PACKAGE_PROVIDES_HOST_GO
+ string
+ # Default to host-go-src
+ default "host-go-src" if BR2_PACKAGE_HOST_GO_SRC
+
+endif
+
source "package/go/go-bootstrap-stage1/Config.in.host"
source "package/go/go-bootstrap-stage2/Config.in.host"
diff --git a/package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch
similarity index 100%
rename from package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch
rename to package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch
diff --git a/package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go-src/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch
similarity index 100%
rename from package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch
rename to package/go/go-src/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch
diff --git a/package/go/go/go.hash b/package/go/go-src/go-src.hash
similarity index 100%
rename from package/go/go/go.hash
rename to package/go/go-src/go-src.hash
diff --git a/package/go/go/go.mk b/package/go/go-src/go-src.mk
similarity index 68%
rename from package/go/go/go.mk
rename to package/go/go-src/go-src.mk
index 8e3780eb29..07809ecb3e 100644
--- a/package/go/go/go.mk
+++ b/package/go/go-src/go-src.mk
@@ -1,21 +1,22 @@
################################################################################
#
-# go
+# go-src
#
################################################################################
-GO_SITE = https://storage.googleapis.com/golang
-GO_SOURCE = go$(GO_VERSION).src.tar.gz
+GO_SRC_SITE = https://storage.googleapis.com/golang
+GO_SRC_SOURCE = go$(GO_VERSION).src.tar.gz
-GO_LICENSE = BSD-3-Clause
-GO_LICENSE_FILES = LICENSE
-GO_CPE_ID_VENDOR = golang
+GO_SRC_LICENSE = BSD-3-Clause
+GO_SRC_LICENSE_FILES = LICENSE
+GO_SRC_CPE_ID_VENDOR = golang
-HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2
+HOST_GO_SRC_PROVIDES = host-go
+HOST_GO_SRC_DEPENDENCIES = host-go-bootstrap-stage2
ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y)
-HOST_GO_CROSS_ENV = \
+HOST_GO_SRC_CROSS_ENV = \
CC_FOR_TARGET="$(TARGET_CC)" \
CXX_FOR_TARGET="$(TARGET_CXX)" \
GOOS="linux" \
@@ -28,7 +29,7 @@ endif
# The go build system is not compatible with ccache, so use
# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685.
-HOST_GO_MAKE_ENV = \
+HOST_GO_SRC_MAKE_ENV = \
GO111MODULE=off \
GOCACHE=$(HOST_GO_HOST_CACHE) \
GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \
@@ -41,12 +42,12 @@ HOST_GO_MAKE_ENV = \
CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \
$(HOST_GO_CROSS_ENV)
-define HOST_GO_BUILD_CMDS
+define HOST_GO_SRC_BUILD_CMDS
cd $(@D)/src && \
- $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v)
+ $(HOST_GO_SRC_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v)
endef
-define HOST_GO_INSTALL_CMDS
+define HOST_GO_SRC_INSTALL_CMDS
$(GO_BINARIES_INSTALL)
endef
diff --git a/package/go/go.mk b/package/go/go.mk
index 21051a2050..42ea218e6c 100644
--- a/package/go/go.mk
+++ b/package/go/go.mk
@@ -129,4 +129,6 @@ define GO_BINARIES_INSTALL
find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \;
endef
+$(eval $(host-virtual-package))
+
include $(sort $(wildcard package/go/*/*.mk))
--
2.42.0
More information about the buildroot
mailing list