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/reg/
Date: Fri, 06 Sep 2019 23:45:34
Message-Id: 1567813379.daa82b31d06f22e506687af38d5f2f46a4fc5a47.zmedico@gentoo
1 commit: daa82b31d06f22e506687af38d5f2f46a4fc5a47
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 6 23:37:57 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 6 23:42:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa82b31
7
8 app-emulation/reg: Fix compile with go-1.13
9
10 Use GO111MODULE=on together with -mod=vendor since otherwise -mod=vendor
11 fails with go-1.12 like this:
12
13 build flag -mod=vendor only valid when using modules
14
15 Package-Manager: Portage-2.3.75, Repoman-2.3.17
16 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
17
18 app-emulation/reg/reg-0.16.0_p20190102.ebuild | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21 diff --git a/app-emulation/reg/reg-0.16.0_p20190102.ebuild b/app-emulation/reg/reg-0.16.0_p20190102.ebuild
22 index 3d7a774209c..e1be9fc0449 100644
23 --- a/app-emulation/reg/reg-0.16.0_p20190102.ebuild
24 +++ b/app-emulation/reg/reg-0.16.0_p20190102.ebuild
25 @@ -36,7 +36,7 @@ src_prepare() {
26
27 src_compile() {
28 pushd src/${EGO_PN} || die
29 - GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
30 + GOPATH="${S}" GO111MODULE=on go build -mod=vendor -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
31 popd || die
32 }