1 |
commit: 59d17bebd6f1f994e52ce79bea9d99ce98883416 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 25 17:45:57 2015 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 25 17:47:11 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d17beb |
7 |
|
8 |
dev-lang/go: sync live ebuild |
9 |
|
10 |
dev-lang/go/go-9999.ebuild | 31 ++++++++++++++++--------------- |
11 |
1 file changed, 16 insertions(+), 15 deletions(-) |
12 |
|
13 |
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild |
14 |
index 8d4c715..ed766ec 100644 |
15 |
--- a/dev-lang/go/go-9999.ebuild |
16 |
+++ b/dev-lang/go/go-9999.ebuild |
17 |
@@ -54,6 +54,7 @@ go_arch() |
18 |
local portage_arch=$(tc-arch $@) |
19 |
case "${portage_arch}" in |
20 |
x86) echo 386;; |
21 |
+ x64-*) echo amd64;; |
22 |
*) echo "${portage_arch}";; |
23 |
esac |
24 |
} |
25 |
@@ -150,28 +151,28 @@ src_test() |
26 |
|
27 |
src_install() |
28 |
{ |
29 |
- local bin_path="${GOBIN}" |
30 |
- if go_cross_compile; then |
31 |
- bin_path="${GOBIN}/$(go_tuple)" |
32 |
- fi |
33 |
- dobin "${bin_path}"/* |
34 |
- dodoc AUTHORS CONTRIBUTORS PATENTS README.md |
35 |
+ local bin_path f x |
36 |
|
37 |
- dodir /usr/lib/go /usr/lib/go/pkg /usr/lib/go/pkg/tool |
38 |
+ dodir /usr/lib/go |
39 |
insinto /usr/lib/go |
40 |
|
41 |
# There is a known issue which requires the source tree to be installed [1]. |
42 |
# Once this is fixed, we can consider using the doc use flag to control |
43 |
# installing the doc and src directories. |
44 |
# [1] https://golang.org/issue/2775 |
45 |
- doins -r doc lib src |
46 |
- |
47 |
- # Selectively install pkg directory to exclude the bootstrap build |
48 |
- insinto /usr/lib/go/pkg |
49 |
- doins -r pkg/include "pkg/$(go_tuple)" |
50 |
- insinto /usr/lib/go/pkg/tool |
51 |
- doins -r "pkg/tool/$(go_tuple)" |
52 |
- fperms -R +x /usr/lib/go/pkg/tool |
53 |
+ doins -r bin doc lib pkg src |
54 |
+ fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool |
55 |
+ |
56 |
+ if go_cross_compile; then |
57 |
+ bin_path="bin/$(go_tuple)" |
58 |
+ else |
59 |
+ bin_path=bin |
60 |
+ fi |
61 |
+ for x in ${bin_path}/*; do |
62 |
+ f=${x##*/} |
63 |
+ dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} |
64 |
+ done |
65 |
+ dodoc AUTHORS CONTRIBUTORS PATENTS README.md |
66 |
} |
67 |
|
68 |
pkg_preinst() |