diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk index d52ad481f..9ea34be82 100644 --- a/lang/golang/golang-values.mk +++ b/lang/golang/golang-values.mk @@ -21,6 +21,7 @@ unexport \ GOARCH \ GOBIN \ GOCACHE \ + GOMODCACHE \ GODEBUG \ GOENV \ GOFLAGS \ @@ -110,13 +111,13 @@ unexport \ BOOT_GO_GCFLAGS \ BOOT_GO_LDFLAGS -# From https://golang.org/src/cmd/dist/buildtool.go +# From https://golang.org/src/cmd/dist/buildruntime.go unexport \ - GOBOOTSTRAP_TOOLEXEC + GOEXPERIMENT -# From https://golang.org/src/cmd/internal/objabi/util.go +# From https://golang.org/src/cmd/dist/buildtool.go unexport \ - GOEXPERIMENT + GOBOOTSTRAP_TOOLEXEC # GOOS / GOARCH @@ -198,6 +199,8 @@ GO_PIE_SUPPORTED_OS_ARCH:= \ android_386 android_amd64 android_arm android_arm64 \ linux_386 linux_amd64 linux_arm linux_arm64 \ \ + windows_386 windows_amd64 windows_arm \ + \ darwin_amd64 \ freebsd_amd64 \ \ @@ -205,7 +208,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \ \ linux_ppc64le linux_s390x -go_pie_install_suffix=$(if $(filter $(1),aix_ppc64),,shared) +go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm),,shared) ifneq ($(filter $(GO_HOST_OS_ARCH),$(GO_PIE_SUPPORTED_OS_ARCH)),) GO_HOST_PIE_SUPPORTED:=1 diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 320ed7812..45d79bc32 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk -GO_VERSION_MAJOR_MINOR:=1.14 -GO_VERSION_PATCH:=7 +GO_VERSION_MAJOR_MINOR:=1.15 +GO_VERSION_PATCH:=2 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=064392433563660c73186991c0a315787688e7c38a561e26647686f89b6c30e3 +PKG_HASH:=28bf9d0bcde251011caae230a4a05d917b172ea203f2a62f2c2f9533589d4b4d PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause @@ -52,15 +52,15 @@ HOST_GO_ROOT:=$(HOST_GO_PREFIX)/lib/go-$(HOST_GO_VERSION_ID) HOST_GO_VALID_OS_ARCH:= \ android_386 android_amd64 android_arm android_arm64 \ - darwin_386 darwin_amd64 darwin_arm darwin_arm64 \ freebsd_386 freebsd_amd64 freebsd_arm freebsd_arm64 \ linux_386 linux_amd64 linux_arm linux_arm64 \ + openbsd_386 openbsd_amd64 openbsd_arm openbsd_arm64 \ \ - openbsd_386 openbsd_amd64 openbsd_arm \ netbsd_386 netbsd_amd64 netbsd_arm \ plan9_386 plan9_amd64 plan9_arm \ + windows_386 windows_amd64 windows_arm \ \ - windows_386 windows_amd64 \ + darwin_amd64 darwin_arm64 \ \ dragonfly_amd64 \ illumos_amd64 \