diff --git a/native/go-1.4/Makefile b/native/go-1.4/Makefile deleted file mode 100644 index 4dc21310f533..000000000000 --- a/native/go-1.4/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -PKG_NAME = go -PKG_VERS = 1.4-bootstrap-20171003 -PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://dl.google.com/go/ -PKG_DIR = $(PKG_NAME) - -DEPENDS = - -HOMEPAGE = https://golang.org -COMMENT = Go is an open source programming language that makes it easy to build simple, reliable, and efficient software. -LICENSE = BSD-style - -CONFIGURE_TARGET = nop -COMPILE_TARGET = nop -INSTALL_TARGET = go_bootstrap_install - -include ../../mk/spksrc.native-cc.mk - -.PHONY: go_bootstrap_install -go_bootstrap_install: - @$(MSG) "Building Go 1.4" - cd $(WORK_DIR)/$(PKG_NAME)/src && GOARCH="" ./make.bash diff --git a/native/go-1.4/digests b/native/go-1.4/digests deleted file mode 100644 index 6fb8098917ed..000000000000 --- a/native/go-1.4/digests +++ /dev/null @@ -1,3 +0,0 @@ -go1.4-bootstrap-20171003.tar.gz SHA1 881f0c980a6d6f4e0427a86237298dd9717d8ecf -go1.4-bootstrap-20171003.tar.gz SHA256 f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52 -go1.4-bootstrap-20171003.tar.gz MD5 dbf727a4b0e365bf88d97cbfde590016 diff --git a/native/go/Makefile b/native/go/Makefile index 1ca3c7d201f7..d7fe29f72d5c 100644 --- a/native/go/Makefile +++ b/native/go/Makefile @@ -1,26 +1,15 @@ PKG_NAME = go PKG_VERS = 1.16.5 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).src.$(PKG_EXT) -PKG_DIST_SITE = https://storage.googleapis.com/golang +PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).linux-amd64.$(PKG_EXT) +PKG_DIST_SITE = https://golang.org/dl PKG_DIR = $(PKG_NAME) -DEPENDS = native/go-1.4 - HOMEPAGE = https://golang.org/ COMMENT = Go is an open source programming language that makes it easy to build simple, reliable, and efficient software. LICENSE = BSD-style -CONFIGURE_TARGET = nop -COMPILE_TARGET = go_native_compile +# extract only to $(WORK_DIR) INSTALL_TARGET = nop -GOROOT_BOOTSTRAP14=$(WORK_DIR)/../../go-1.4/work-native/go - -include ../../mk/spksrc.native-cc.mk - -.PHONY: go_native_compile -go_native_compile: - @$(MSG) "Building Go for host system" - # GO111MODULE disable go.mod per https://github.com/golang/go/issues/26996 - cd $(WORK_DIR)/$(PKG_NAME)/src && CC=gcc CXX=g++ GOOS="linux" GOHOSTARCH="amd64" GOARCH="amd64" GO111MODULE=off GOROOT_BOOTSTRAP=$(GOROOT_BOOTSTRAP14) ./make.bash +include ../../mk/spksrc.native-install.mk