From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02090138334 for ; Fri, 6 Sep 2019 23:28:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BC9EE09FA; Fri, 6 Sep 2019 23:28:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 113D9E09FA for ; Fri, 6 Sep 2019 23:28:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05EC534AD82 for ; Fri, 6 Sep 2019 23:28:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 70EAD6FE for ; Fri, 6 Sep 2019 23:28:07 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1567812432.f34ce87c547ed6082b39044e2bee993325db98d8.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/skopeo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/skopeo/skopeo-0.1.39.ebuild X-VCS-Directories: app-emulation/skopeo/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f34ce87c547ed6082b39044e2bee993325db98d8 X-VCS-Branch: master Date: Fri, 6 Sep 2019 23:28:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a7c3934a-a00e-413e-bfa0-1156329e2c99 X-Archives-Hash: 1c1b23b084aebeff4932ab6aab5f4b90 commit: f34ce87c547ed6082b39044e2bee993325db98d8 Author: Zac Medico gentoo org> AuthorDate: Fri Sep 6 23:25:20 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Sep 6 23:27:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34ce87c app-emulation/skopeo: Fix compile with go-1.13 This fix is conditional on go-1.13 since -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 gentoo.org> app-emulation/skopeo/skopeo-0.1.39.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-emulation/skopeo/skopeo-0.1.39.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild index 49a0b85e587..80e35c4d984 100644 --- a/app-emulation/skopeo/skopeo-0.1.39.ebuild +++ b/app-emulation/skopeo/skopeo-0.1.39.ebuild @@ -31,7 +31,8 @@ RESTRICT="test" src_compile() { local BUILDTAGS="containers_image_ostree_stub" set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \ - go build -ldflags "-X main.gitCommit=${COMMIT}" \ + go build $(has_version -b '>=dev-lang/go-1.13' && printf -- -mod=vendor) \ + -ldflags "-X main.gitCommit=${COMMIT}" \ -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \ -o skopeo ./cmd/skopeo echo "$@"