1 |
1. go compiler does not support none x86 platform |
2 |
2. gcc5 includes go command for build go apps |
3 |
|
4 |
Signed-off-by: Leno Hou <lenohou@×××××.com> |
5 |
--- |
6 |
app-emulation/docker/docker-1.6.1.ebuild | 5 ++++- |
7 |
app-emulation/docker/docker-1.6.2.ebuild | 5 ++++- |
8 |
app-emulation/docker/docker-1.7.1.ebuild | 5 ++++- |
9 |
eclass/golang-base.eclass | 2 +- |
10 |
4 files changed, 13 insertions(+), 4 deletions(-) |
11 |
|
12 |
diff --git a/app-emulation/docker/docker-1.6.1.ebuild b/app-emulation/docker/docker-1.6.1.ebuild |
13 |
index adabf38..16690d6 100644 |
14 |
--- a/app-emulation/docker/docker-1.6.1.ebuild |
15 |
+++ b/app-emulation/docker/docker-1.6.1.ebuild |
16 |
@@ -39,7 +39,10 @@ CDEPEND=" |
17 |
|
18 |
DEPEND=" |
19 |
${CDEPEND} |
20 |
- >=dev-lang/go-1.3 |
21 |
+ || ( |
22 |
+ >=dev-lang/go-1.3 |
23 |
+ >=sys-devel/gcc-5.1.0:=[go] |
24 |
+ ) |
25 |
btrfs? ( |
26 |
>=sys-fs/btrfs-progs-3.16.1 |
27 |
) |
28 |
diff --git a/app-emulation/docker/docker-1.6.2.ebuild b/app-emulation/docker/docker-1.6.2.ebuild |
29 |
index 1eb4f5f..db34765 100644 |
30 |
--- a/app-emulation/docker/docker-1.6.2.ebuild |
31 |
+++ b/app-emulation/docker/docker-1.6.2.ebuild |
32 |
@@ -39,7 +39,10 @@ CDEPEND=" |
33 |
|
34 |
DEPEND=" |
35 |
${CDEPEND} |
36 |
- >=dev-lang/go-1.3 |
37 |
+ || ( |
38 |
+ >=dev-lang/go-1.3 |
39 |
+ >=sys-devel/gcc-5.1.0:=[go] |
40 |
+ ) |
41 |
btrfs? ( |
42 |
>=sys-fs/btrfs-progs-3.16.1 |
43 |
) |
44 |
diff --git a/app-emulation/docker/docker-1.7.1.ebuild b/app-emulation/docker/docker-1.7.1.ebuild |
45 |
index 6f618a2..d643bfd 100644 |
46 |
--- a/app-emulation/docker/docker-1.7.1.ebuild |
47 |
+++ b/app-emulation/docker/docker-1.7.1.ebuild |
48 |
@@ -39,7 +39,10 @@ CDEPEND=" |
49 |
|
50 |
DEPEND=" |
51 |
${CDEPEND} |
52 |
- >=dev-lang/go-1.4:= |
53 |
+ || ( |
54 |
+ >=dev-lang/go-1.4:= |
55 |
+ >=sys-devel/gcc-5.1.0:=[go] |
56 |
+ ) |
57 |
btrfs? ( |
58 |
>=sys-fs/btrfs-progs-3.8 |
59 |
) |
60 |
diff --git a/eclass/golang-base.eclass b/eclass/golang-base.eclass |
61 |
index 0c54266..05bcc78 100644 |
62 |
--- a/eclass/golang-base.eclass |
63 |
+++ b/eclass/golang-base.eclass |
64 |
@@ -23,7 +23,7 @@ if [[ -z ${_GOLANG_BASE} ]]; then |
65 |
|
66 |
_GOLANG_BASE=1 |
67 |
|
68 |
-DEPEND=">=dev-lang/go-1.4.2:=" |
69 |
+DEPEND="|| ( >=dev-lang/go-1.4.2:= >=sys-devel/gcc-5.1.0:=[go] )" |
70 |
STRIP_MASK="*.a" |
71 |
|
72 |
# @ECLASS-VARIABLE: EGO_PN |
73 |
-- |
74 |
2.1.0 |