Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/
Date: Fri, 06 Sep 2019 22:47:50
Message-Id: 1567810056.47e78e715f170ce2cfc48d7568cc83b597663c2d.zmedico@gentoo
1 commit: 47e78e715f170ce2cfc48d7568cc83b597663c2d
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 6 22:45:30 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 6 22:47:36 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e78e71
7
8 app-emulation/cri-o: Fix compile for go-1.13
9
10 Reported-by: Toralf Förster <toralf <AT> gentoo.org>
11 Closes: https://bugs.gentoo.org/693630
12 Package-Manager: Portage-2.3.75, Repoman-2.3.17
13 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
14
15 app-emulation/cri-o/cri-o-1.15.0.ebuild | 3 +++
16 1 file changed, 3 insertions(+)
17
18 diff --git a/app-emulation/cri-o/cri-o-1.15.0.ebuild b/app-emulation/cri-o/cri-o-1.15.0.ebuild
19 index 32d09b53550..808c52e4c27 100644
20 --- a/app-emulation/cri-o/cri-o-1.15.0.ebuild
21 +++ b/app-emulation/cri-o/cri-o-1.15.0.ebuild
22 @@ -42,6 +42,9 @@ S="${WORKDIR}/${P}/src/${EGO_PN}"
23 src_prepare() {
24 default
25
26 + # Avoid network-sandbox violations since go-1.13
27 + rm go.mod || die
28 +
29 sed -e '/^GIT_.*/d' \
30 -e '/ git diff --exit-code/d' \
31 -e 's/$(GO) build -i/$(GO) build -v -work -x/' \