1 |
commit: f7986fe91c1531b78b50d4448e72248b6075fe81 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 23 17:21:18 2017 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 23 17:22:28 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7986fe9 |
7 |
|
8 |
app-admin/consul: avoid zip dependency |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
app-admin/consul/consul-0.7.2.ebuild | 8 +++++--- |
13 |
1 file changed, 5 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/app-admin/consul/consul-0.7.2.ebuild b/app-admin/consul/consul-0.7.2.ebuild |
16 |
index be5a8fc..7bbd099 100644 |
17 |
--- a/app-admin/consul/consul-0.7.2.ebuild |
18 |
+++ b/app-admin/consul/consul-0.7.2.ebuild |
19 |
@@ -22,7 +22,6 @@ IUSE="" |
20 |
RESTRICT="test" |
21 |
|
22 |
DEPEND=" |
23 |
- app-arch/zip |
24 |
>=dev-lang/go-1.6:= |
25 |
>=dev-go/go-tools-0_pre20160121" |
26 |
RDEPEND="" |
27 |
@@ -79,8 +78,11 @@ src_prepare() { |
28 |
src_compile() { |
29 |
export GOPATH="${S}" |
30 |
go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die |
31 |
- PATH=${PATH}:${S}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) \ |
32 |
- emake -C "${S}/src/${EGO_PN}" |
33 |
+ # The dev target sets causes build.sh to set appropriate XC_OS |
34 |
+ # and XC_ARCH, and skips generation of an unused zip file, |
35 |
+ # avoiding a dependency on app-arch/zip. |
36 |
+ PATH=${PATH}:${S}/bin \ |
37 |
+ emake -C "${S}/src/${EGO_PN}" dev |
38 |
} |
39 |
|
40 |
src_install() { |