app-emulation/skopeo: Use GO111MODULE=on for -mod=vendor backward compat
authorZac Medico <zmedico@gentoo.org>
Fri, 6 Sep 2019 23:51:45 +0000 (16:51 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 6 Sep 2019 23:52:04 +0000 (16:52 -0700)
Use GO111MODULE=on together with -mod=vendor since otherwise -mod=vendor
fails with go-1.12 like this:

build flag -mod=vendor only valid when using modules

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Zac Medico <zmedico@gentoo.org>
app-emulation/skopeo/skopeo-0.1.39.ebuild

index 80e35c4d984bf7bb4af151b430f13d21a02f507f..3af894ea4f9a5c6e35d2b6359fc2c01f236d46de 100644 (file)
@@ -30,9 +30,8 @@ RESTRICT="test"
 
 src_compile() {
        local BUILDTAGS="containers_image_ostree_stub"
-       set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
-               go build $(has_version -b '>=dev-lang/go-1.13' && printf -- -mod=vendor) \
-               -ldflags "-X main.gitCommit=${COMMIT}" \
+       set -- env -u GOCACHE -u XDG_CACHE_HOME GO111MODULE=on GOPATH="${WORKDIR}/${P}" \
+               go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
                -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
                -o skopeo ./cmd/skopeo
        echo "$@"