From 61aa059a13a0c6d35c32a0d27d365e8f1624d93a Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 3 Jun 2020 11:10:08 +0200 Subject: [PATCH] app-emulation/docker: set go1.13 in DOCKER_BUILDTAGS Since Docker >= 19.03.9 started to depend on github.com/pkg/errors v0.9.1 or newer, it is now necessary to set `go1.13` in `DOCKER_BUILDTAGS`. Otherwise, it cannot find `Is` function. See also https://github.com/pkg/errors/blob/v0.9.1/go113.go#L16 . --- .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 8ca9a795de..6c3ee9b950 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 COREOS_GO_PACKAGE="github.com/docker/docker-ce" -COREOS_GO_VERSION="go1.12" +COREOS_GO_VERSION="go1.13" if [[ ${PV} = *9999* ]]; then # Docker cannot be fetched via "go get", thanks to autogenerated code @@ -231,6 +231,10 @@ src_compile() { fi done + # need to set go1.13 in DOCKER_BUILDTAGS, to avoid build + # failures caused by github.com/pkg/errors >= 0.9.1. + DOCKER_BUILDTAGS+=" go1.13" + pushd components/engine || die if use hardened; then