1 |
commit: 043456875e7dbd207ac6e30ea75e2a88fc1114d4 |
2 |
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 18 08:01:41 2016 +0000 |
4 |
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 18 08:02:02 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04345687 |
7 |
|
8 |
dev-lang/go: Bump to 1.6 |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
dev-lang/go/Manifest | 3 +- |
13 |
dev-lang/go/{go-1.6_rc1.ebuild => go-1.6.ebuild} | 6 +- |
14 |
dev-lang/go/go-1.6_rc2.ebuild | 211 ----------------------- |
15 |
3 files changed, 3 insertions(+), 217 deletions(-) |
16 |
|
17 |
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest |
18 |
index 545f19c..29d12a2 100644 |
19 |
--- a/dev-lang/go/Manifest |
20 |
+++ b/dev-lang/go/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST go1.4.2.src.tar.gz 10921896 SHA256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b SHA512 cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c WHIRLPOOL d06c27f6ff3a6499a6c7cb3c5eccd53eb588896c4d837e1fe9855c22ee3caa5cc48fd68cbeceff105b7c47fafbbf0eb3dc28ee3af7196692c5bf18511c6760ef |
23 |
DIST go1.5.3.src.tar.gz 12057623 SHA256 754e06dab1c31ab168fc9db9e32596734015ea9e24bc44cae7f237f417ce4efe SHA512 b348832ea7cb095cf793960cf9f4da5e9f6ca8de7b5262bb819de97efea4835643e30a18efd4a82d01ea3854a1905af9e134271716c4b68c9d2a8f6e15f65ff0 WHIRLPOOL aec869ec6af62601f6b83283417eef739141f99be938d419ef4a553028141e05ded7777fdff2a2d1a3e35e4976e4ec96a301b4875c509a370848d0df5dc9e0c8 |
24 |
-DIST go1.6rc1.src.tar.gz 12597286 SHA256 2d1a6756f24227dcee955add4af7d194eb4a8c3656b2c4ce778994e21a533a83 SHA512 539ba9603d87bf09d37ab37a7256cb6860357ce976ac000814e733d5ae4f2d1150a4d75412b70dba0fae453aa6fc36c0cc03874d9adce7d23a168551611a47f4 WHIRLPOOL c7f272dfec8a2526bacc1cba165afb5a7c8e6df2540132ce0934795df0c0952752ee7cdee3201a9f13da1f15b13c5b67c0879ef9eedfd60d47be0f9525b37961 |
25 |
-DIST go1.6rc2.src.tar.gz 12602910 SHA256 92914a23cde7e34e1d017175d785e5850fbb28f323a145028e2e26053ef1a598 SHA512 33771377244fd7e7e06e093738fe09381a90f9375e86a807b58e5c2169ffab16eacd832bb28e8e3b759f8ba3283626fe089a3c5bdced4e919218e49eb585e42d WHIRLPOOL b6cc9e0425b74abfa94c0bcbbd0f2e0e82ef6e83ed1d6f8362dfa5beb907db6e424810c9f1b2ec8a00faf65fcaf943eff1e39deec19a14674d5f039795848d3c |
26 |
+DIST go1.6.src.tar.gz 12613308 SHA256 a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146 SHA512 59e9d72a80558fd5e3f176e068897a45333b36e35f6c00393647941a70e741168e65941b6059397378020c3b78ec3471a48809682f7efd97cf33eec6325fc3e8 WHIRLPOOL c6debe1a5039f0ca34c29b4a53f958503a724cae13715ea14f0237b5faacd26e09eb6405462e22abd6806540dd8fb9eb2fa08ff6e8676b0f6dffa267210f5eac |
27 |
|
28 |
diff --git a/dev-lang/go/go-1.6_rc1.ebuild b/dev-lang/go/go-1.6.ebuild |
29 |
similarity index 96% |
30 |
rename from dev-lang/go/go-1.6_rc1.ebuild |
31 |
rename to dev-lang/go/go-1.6.ebuild |
32 |
index b234182..c57298b 100644 |
33 |
--- a/dev-lang/go/go-1.6_rc1.ebuild |
34 |
+++ b/dev-lang/go/go-1.6.ebuild |
35 |
@@ -7,18 +7,16 @@ EAPI=5 |
36 |
export CBUILD=${CBUILD:-${CHOST}} |
37 |
export CTARGET=${CTARGET:-${CHOST}} |
38 |
|
39 |
-MY_PV=${PV/_/} |
40 |
- |
41 |
inherit eutils toolchain-funcs |
42 |
|
43 |
if [[ ${PV} = 9999 ]]; then |
44 |
EGIT_REPO_URI="git://github.com/golang/go.git" |
45 |
inherit git-r3 |
46 |
else |
47 |
- SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz" |
48 |
+ SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" |
49 |
# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures. |
50 |
# Allowing other bootstrap options would enable arm64 and ppc64 builds. |
51 |
- KEYWORDS="" |
52 |
+ KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris" |
53 |
fi |
54 |
|
55 |
DESCRIPTION="A concurrent garbage collected and typesafe programming language" |
56 |
|
57 |
diff --git a/dev-lang/go/go-1.6_rc2.ebuild b/dev-lang/go/go-1.6_rc2.ebuild |
58 |
deleted file mode 100644 |
59 |
index 25fbae1..0000000 |
60 |
--- a/dev-lang/go/go-1.6_rc2.ebuild |
61 |
+++ /dev/null |
62 |
@@ -1,211 +0,0 @@ |
63 |
-# Copyright 1999-2015 Gentoo Foundation |
64 |
-# Distributed under the terms of the GNU General Public License v2 |
65 |
-# $Id$ |
66 |
- |
67 |
-EAPI=6 |
68 |
- |
69 |
-export CBUILD=${CBUILD:-${CHOST}} |
70 |
-export CTARGET=${CTARGET:-${CHOST}} |
71 |
- |
72 |
-MY_PV=${PV/_/} |
73 |
- |
74 |
-inherit toolchain-funcs |
75 |
- |
76 |
-if [[ ${PV} = 9999 ]]; then |
77 |
- EGIT_REPO_URI="git://github.com/golang/go.git" |
78 |
- inherit git-r3 |
79 |
-else |
80 |
- SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz" |
81 |
- # go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures. |
82 |
- # Allowing other bootstrap options would enable arm64 and ppc64 builds. |
83 |
- case ${PV} in |
84 |
- *9999*|*_rc*) ;; |
85 |
- *) |
86 |
- KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" |
87 |
- ;; |
88 |
- esac |
89 |
-fi |
90 |
- |
91 |
-DESCRIPTION="A concurrent garbage collected and typesafe programming language" |
92 |
-HOMEPAGE="http://www.golang.org" |
93 |
- |
94 |
-LICENSE="BSD" |
95 |
-SLOT="0/${PV}" |
96 |
-IUSE="" |
97 |
- |
98 |
-DEPEND=">=dev-lang/go-bootstrap-1.4.1" |
99 |
-RDEPEND="!<dev-go/go-tools-0_pre20150902" |
100 |
- |
101 |
-# These test data objects have writable/executable stacks. |
102 |
-QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj" |
103 |
- |
104 |
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*" |
105 |
- |
106 |
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail. |
107 |
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" |
108 |
- |
109 |
-# The go language uses *.a files which are _NOT_ libraries and should not be |
110 |
-# stripped. The test data objects should also be left alone and unstripped. |
111 |
-STRIP_MASK="/usr/lib/go/pkg/*.a |
112 |
- /usr/lib/go/src/debug/elf/testdata/* |
113 |
- /usr/lib/go/src/debug/dwarf/testdata/* |
114 |
- /usr/lib/go/src/runtime/race/*.syso" |
115 |
- |
116 |
-if [[ ${PV} != 9999 ]]; then |
117 |
- S="${WORKDIR}"/go |
118 |
-fi |
119 |
- |
120 |
-go_arch() |
121 |
-{ |
122 |
- # By chance most portage arch names match Go |
123 |
- local portage_arch=$(tc-arch $@) |
124 |
- case "${portage_arch}" in |
125 |
- x86) echo 386;; |
126 |
- x64-*) echo amd64;; |
127 |
- *) echo "${portage_arch}";; |
128 |
- esac |
129 |
-} |
130 |
- |
131 |
-go_arm() |
132 |
-{ |
133 |
- case "${1:-${CHOST}}" in |
134 |
- armv5*) echo 5;; |
135 |
- armv6*) echo 6;; |
136 |
- armv7*) echo 7;; |
137 |
- *) |
138 |
- die "unknown GOARM for ${1:-${CHOST}}" |
139 |
- ;; |
140 |
- esac |
141 |
-} |
142 |
- |
143 |
-go_os() |
144 |
-{ |
145 |
- case "${1:-${CHOST}}" in |
146 |
- *-linux*) echo linux;; |
147 |
- *-darwin*) echo darwin;; |
148 |
- *-freebsd*) echo freebsd;; |
149 |
- *-netbsd*) echo netbsd;; |
150 |
- *-openbsd*) echo openbsd;; |
151 |
- *-solaris*) echo solaris;; |
152 |
- *-cygwin*|*-interix*|*-winnt*) |
153 |
- echo windows |
154 |
- ;; |
155 |
- *) |
156 |
- die "unknown GOOS for ${1:-${CHOST}}" |
157 |
- ;; |
158 |
- esac |
159 |
-} |
160 |
- |
161 |
-go_tuple() |
162 |
-{ |
163 |
- echo "$(go_os $@)_$(go_arch $@)" |
164 |
-} |
165 |
- |
166 |
-go_cross_compile() |
167 |
-{ |
168 |
- [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]] |
169 |
-} |
170 |
- |
171 |
-pkg_pretend() |
172 |
-{ |
173 |
- # make.bash does not understand cross-compiling a cross-compiler |
174 |
- if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then |
175 |
- die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}" |
176 |
- fi |
177 |
-} |
178 |
- |
179 |
-src_compile() |
180 |
-{ |
181 |
- export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4 |
182 |
- export GOROOT_FINAL="${EPREFIX}"/usr/lib/go |
183 |
- export GOROOT="$(pwd)" |
184 |
- export GOBIN="${GOROOT}/bin" |
185 |
- |
186 |
- # Go's build script does not use BUILD/HOST/TARGET consistently. :( |
187 |
- export GOHOSTARCH=$(go_arch ${CBUILD}) |
188 |
- export GOHOSTOS=$(go_os ${CBUILD}) |
189 |
- export CC=$(tc-getBUILD_CC) |
190 |
- |
191 |
- export GOARCH=$(go_arch) |
192 |
- export GOOS=$(go_os) |
193 |
- export CC_FOR_TARGET=$(tc-getCC) |
194 |
- export CXX_FOR_TARGET=$(tc-getCXX) |
195 |
- if [[ ${ARCH} == arm ]]; then |
196 |
- export GOARM=$(go_arm) |
197 |
- fi |
198 |
- |
199 |
- cd src |
200 |
- ./make.bash || die "build failed" |
201 |
-} |
202 |
- |
203 |
-src_test() |
204 |
-{ |
205 |
- go_cross_compile && return 0 |
206 |
- |
207 |
- cd src |
208 |
- PATH="${GOBIN}:${PATH}" \ |
209 |
- ./run.bash -no-rebuild || die "tests failed" |
210 |
-} |
211 |
- |
212 |
-src_install() |
213 |
-{ |
214 |
- local bin_path f x |
215 |
- |
216 |
- dodir /usr/lib/go |
217 |
- insinto /usr/lib/go |
218 |
- |
219 |
- # There is a known issue which requires the source tree to be installed [1]. |
220 |
- # Once this is fixed, we can consider using the doc use flag to control |
221 |
- # installing the doc and src directories. |
222 |
- # [1] https://golang.org/issue/2775 |
223 |
- doins -r bin doc lib pkg src |
224 |
- fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool |
225 |
- |
226 |
- cp -a misc "${D}"/usr/lib/go/misc |
227 |
- |
228 |
- if go_cross_compile; then |
229 |
- bin_path="bin/$(go_tuple)" |
230 |
- else |
231 |
- bin_path=bin |
232 |
- fi |
233 |
- for x in ${bin_path}/*; do |
234 |
- f=${x##*/} |
235 |
- dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} |
236 |
- done |
237 |
- dodoc AUTHORS CONTRIBUTORS PATENTS README.md |
238 |
-} |
239 |
- |
240 |
-pkg_preinst() |
241 |
-{ |
242 |
- has_version '<dev-lang/go-1.4' && |
243 |
- export had_support_files=true || |
244 |
- export had_support_files=false |
245 |
-} |
246 |
- |
247 |
-pkg_postinst() |
248 |
-{ |
249 |
- # If the go tool sees a package file timestamped older than a dependancy it |
250 |
- # will rebuild that file. So, in order to stop go from rebuilding lots of |
251 |
- # packages for every build we need to fix the timestamps. The compiler and |
252 |
- # linker are also checked - so we need to fix them too. |
253 |
- ebegin "fixing timestamps to avoid unnecessary rebuilds" |
254 |
- tref="usr/lib/go/pkg/*/runtime.a" |
255 |
- find "${EROOT}"usr/lib/go -type f \ |
256 |
- -exec touch -r "${EROOT}"${tref} {} \; |
257 |
- eend $? |
258 |
- |
259 |
- if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && |
260 |
- ${REPLACING_VERSIONS} != ${PV} ]]; then |
261 |
- elog "Release notes are located at http://golang.org/doc/go${PV}" |
262 |
- fi |
263 |
- |
264 |
- if $had_support_files; then |
265 |
- ewarn |
266 |
- ewarn "All editor support, IDE support, shell completion" |
267 |
- ewarn "support, etc has been removed from the go package" |
268 |
- ewarn "upstream." |
269 |
- ewarn "For more information on which support is available, see" |
270 |
- ewarn "the following URL:" |
271 |
- ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins" |
272 |
- fi |
273 |
-} |