From 73cbb937dc8e93be049fefb0aea2e4fbf9b02f9a Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 10 Aug 2016 18:47:18 -0700 Subject: [PATCH] dev-lang/go: bump to 1.6.3 --- .../coreos-overlay/dev-lang/go/Manifest | 1 + .../dev-lang/go/go-1.5.4-r1.ebuild | 228 +++++++++++++++++- .../dev-lang/go/go-1.6.3.ebuild | 1 + 3 files changed, 229 insertions(+), 1 deletion(-) mode change 120000 => 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.4-r1.ebuild create mode 120000 sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.6.3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest index b967f80744..9ea13baa97 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest @@ -1,2 +1,3 @@ DIST go1.4.3.src.tar.gz 10875170 SHA256 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 SHA512 12bade4bce9aa4b34e2b9495ae65a1fc6a2449b3a43bc4de85c8b87ba223c2f999b2f37c1e2fe1188d8521118b5e5357d27afb8b85c0b8ebb4503d4125d25273 WHIRLPOOL 1a869385e63343bc54a950ca965a4d11ca072e6551d1189ef4e2e4da2a488a1ef70b59296d65af0c061f63606b78f73399f25040e02132e56a00189f1aae20e3 DIST go1.5.4.src.tar.gz 12059752 SHA256 002acabce7ddc140d0d55891f9d4fcfbdd806b9332fb8b110c91bc91afb0bc93 SHA512 bff8ad4e792fb92c382327d080f2383e623d39d474317d9b3132167707ced99b7b4866c9ab315b6479eb75891d146b3d71dc0f5a4e81a509090b3205684409ed WHIRLPOOL cd14fc92e513a1ef0882c0dfb28526fa5f8044b99935c7e022b9ca0c10190c8f8a8fb3cb251db280168cfbc00a2a2f25761dfac9b274aa37d2d66bb03360da6f +DIST go1.6.3.src.tar.gz 12617426 SHA256 6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 SHA512 43e9b01220788112a185500bd53f091e7a0023a790092f428e2f40fc1a334dd148558b99d2a1c871b8cc79ad7d2d87a092b93eee7b5a27c2ee675c494de35306 WHIRLPOOL 0a22dc08b89ddfaccf1e871037e7ad6cdbf36f914de527011813d57a2d857478278202314b185e26aa905cb135d13cbea490d03337b42148c6fc2ef93a8cd9fe diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.4-r1.ebuild deleted file mode 120000 index 60dd6f5f74..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.4-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -go-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.4-r1.ebuild new file mode 100644 index 0000000000..17054a4e26 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.4-r1.ebuild @@ -0,0 +1,227 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +inherit eutils toolchain-funcs + +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="git://github.com/golang/go.git" + inherit git-r3 +else + SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" + # arm64 only works when cross-compiling in the SDK + KEYWORDS="-* amd64 ~arm arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" +fi + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="http://www.golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="cros_host arm64-extras" + +# can't build go without go +DEPEND=">=dev-lang/go-bootstrap-1.5.3" +RDEPEND="" + +# These test data objects have writable/executable stacks. +QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj" + +# The tools in /usr/lib/go should not cause the multilib-strict check to fail. +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" + +# The go language uses *.a files which are _NOT_ libraries and should not be +# stripped. The test data objects should also be left alone and unstripped. +STRIP_MASK="/usr/lib/go/pkg/*.a + /usr/lib/go/src/debug/elf/testdata/* + /usr/lib/go/src/debug/dwarf/testdata/* + /usr/lib/go/src/runtime/race/*.syso" + +if use cros_host && use arm64-extras; then + STRIP_MASK+="/usr/lib/go/pkg/tool/linux_arm64/*" +fi + +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}"/go +fi + +go_arch() +{ + # By chance most portage arch names match Go + local portage_arch=$(tc-arch $@) + case "${portage_arch}" in + x86) echo 386;; + x64-*) echo amd64;; + *) echo "${portage_arch}";; + esac +} + +go_arm() +{ + case "${1:-${CHOST}}" in + armv5*) echo 5;; + armv6*) echo 6;; + armv7*) echo 7;; + *) + die "unknown GOARM for ${1:-${CHOST}}" + ;; + esac +} + +go_os() +{ + case "${1:-${CHOST}}" in + *-linux*) echo linux;; + *-darwin*) echo darwin;; + *-freebsd*) echo freebsd;; + *-netbsd*) echo netbsd;; + *-openbsd*) echo openbsd;; + *-solaris*) echo solaris;; + *-cygwin*|*-interix*|*-winnt*) + echo windows + ;; + *) + die "unknown GOOS for ${1:-${CHOST}}" + ;; + esac +} + +go_tuple() +{ + echo "$(go_os $@)_$(go_arch $@)" +} + +go_cross_compile() +{ + [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]] +} + +pkg_pretend() +{ + # make.bash does not understand cross-compiling a cross-compiler + if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then + die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}" + fi +} + +src_prepare() +{ + epatch_user +} + +src_compile() +{ + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go-bootstrap + export GOROOT_FINAL="${EPREFIX}"/usr/lib/go + export GOROOT="$(pwd)" + export GOBIN="${GOROOT}/bin" + + # Go's build script does not use BUILD/HOST/TARGET consistently. :( + export GOHOSTARCH=$(go_arch ${CBUILD}) + export GOHOSTOS=$(go_os ${CBUILD}) + export CC=$(tc-getBUILD_CC) + export GOOS=$(go_os) + + cd src + + # Build the target support first. + if use cros_host && use arm64-extras; then + export GOARCH="arm64" + export CC_FOR_TARGET="aarch64-cros-linux-gnu-gcc" + export CXX_FOR_TARGET="aarch64-cros-linux-gnu-g++" + ebegin "Building for GOARCH=${GOARCH}..." + ./make.bash --no-clean --no-test + eend $? "Build for GOARCH=${GOARCH} failed." || die + fi + + # Build the host last to get the correct settings in the go environment. + export GOARCH=$(go_arch) + export CC_FOR_TARGET=$(tc-getCC) + export CXX_FOR_TARGET=$(tc-getCXX) + if [[ ${ARCH} == arm ]]; then + export GOARM=$(go_arm) + fi + ebegin "Building for GOARCH=${GOARCH}..." + ./make.bash --no-clean --no-test + eend $? "Build for GOARCH=${GOARCH} failed." || die +} + +src_test() +{ + go_cross_compile && return 0 + + cd src + PATH="${GOBIN}:${PATH}" \ + ./run.bash -no-rebuild || die "tests failed" +} + +src_install() +{ + local bin_path="${GOBIN}" + if go_cross_compile; then + bin_path="${GOBIN}/$(go_tuple)" + fi + dobin "${bin_path}"/go "${bin_path}"/gofmt + dodoc AUTHORS CONTRIBUTORS PATENTS README.md + + dodir /usr/lib/go /usr/lib/go/pkg /usr/lib/go/pkg/tool + insinto /usr/lib/go + + # There is a known issue which requires the source tree to be installed [1]. + # Once this is fixed, we can consider using the doc use flag to control + # installing the doc and src directories. + # [1] https://golang.org/issue/2775 + doins -r doc lib src + + # Selectively install pkg directory to exclude the bootstrap build + insinto /usr/lib/go/pkg + doins -r pkg/include "pkg/$(go_tuple)" + insinto /usr/lib/go/pkg/tool + doins -r "pkg/tool/$(go_tuple)" + fperms -R +x /usr/lib/go/pkg/tool + + if use cros_host && use arm64-extras; then + insinto /usr/lib/go/pkg + doins -r pkg/linux_arm64 + fi +} + +pkg_preinst() +{ + has_version '