1 |
commit: d4eb70324020f6bd8e735e08a7d2a89e06393a9d |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 23 15:41:51 2020 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 23 15:43:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4eb7032 |
7 |
|
8 |
dev-lang/go: add back the bdepend for dev-lang/go |
9 |
|
10 |
It should be safe to use go to build itself. |
11 |
Also, this cleans up the has_version testing to select the bootstrap |
12 |
implementation. |
13 |
|
14 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
15 |
|
16 |
dev-lang/go/go-9999.ebuild | 7 ++++++- |
17 |
dev-lang/go/x | 28 ++++++++++++++++++++++++++++ |
18 |
2 files changed, 34 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild |
21 |
index 635b905c4d9..82c9facbd67 100644 |
22 |
--- a/dev-lang/go/go-9999.ebuild |
23 |
+++ b/dev-lang/go/go-9999.ebuild |
24 |
@@ -40,7 +40,9 @@ SLOT="0/${PV}" |
25 |
IUSE="gccgo" |
26 |
|
27 |
BDEPEND="gccgo? ( >=sys-devel/gcc-5[go(-)] ) |
28 |
- !gccgo? ( >=dev-lang/go-bootstrap-1.13.6 )" |
29 |
+ !gccgo? ( || ( |
30 |
+ dev-lang/go |
31 |
+ dev-lang/go-bootstrap ) )" |
32 |
RDEPEND="!<dev-go/go-tools-0_pre20150902" |
33 |
|
34 |
# These test data objects have writable/executable stacks. |
35 |
@@ -145,7 +147,10 @@ src_compile() |
36 |
ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die |
37 |
elif has_version -b dev-lang/go-bootstrap; then |
38 |
export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" |
39 |
+ elif has_version -b dev-lang/go; then |
40 |
+ export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" |
41 |
else |
42 |
+ eerror "Go cannot be built without go or go-bootstrap installed" |
43 |
die "Should not be here, please report a bug" |
44 |
fi |
45 |
|
46 |
|
47 |
diff --git a/dev-lang/go/x b/dev-lang/go/x |
48 |
new file mode 100644 |
49 |
index 00000000000..14d7827f06b |
50 |
--- /dev/null |
51 |
+++ b/dev-lang/go/x |
52 |
@@ -0,0 +1,28 @@ |
53 |
+diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild |
54 |
+index 635b905c4d9..eb74459d848 100644 |
55 |
+--- a/dev-lang/go/go-9999.ebuild |
56 |
++++ b/dev-lang/go/go-9999.ebuild |
57 |
+@@ -40,7 +40,9 @@ SLOT="0/${PV}" |
58 |
+ IUSE="gccgo" |
59 |
+ |
60 |
+ BDEPEND="gccgo? ( >=sys-devel/gcc-5[go(-)] ) |
61 |
+- !gccgo? ( >=dev-lang/go-bootstrap-1.13.6 )" |
62 |
++ !gccgo? ( ||( |
63 |
++ dev-lang/go |
64 |
++ dev-lang/go-bootstrap-1.13.6 ) )" |
65 |
+ RDEPEND="!<dev-go/go-tools-0_pre20150902" |
66 |
+ |
67 |
+ # These test data objects have writable/executable stacks. |
68 |
+@@ -145,8 +147,11 @@ src_compile() |
69 |
+ ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die |
70 |
+ elif has_version -b dev-lang/go-bootstrap; then |
71 |
+ export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" |
72 |
++ elif has_version -b dev-lang/go; then |
73 |
++ export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" |
74 |
+ else |
75 |
+- die "Should not be here, please report a bug" |
76 |
++ eerror "Go cannot be built without go or go-bootstrap installed" |
77 |
++ die "Should not be here, please report a bug. |
78 |
+ fi |
79 |
+ |
80 |
+ export GOROOT_FINAL="${EPREFIX}"/usr/lib/go |