From e8cf09be5456c1f25ac24ddbce0c067dbe9155ea Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 19 Aug 2015 16:21:07 -0700 Subject: [PATCH 1/5] dev-lang/go: import latest upstream live ebuild --- .../coreos-overlay/dev-lang/go/go-9999.ebuild | 89 ++++++++++++------- 1 file changed, 55 insertions(+), 34 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild index 7b52ccb47c..882834358d 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild @@ -1,25 +1,37 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.30 2015/07/06 16:21:21 williamh Exp $ EAPI=5 +export CTARGET=${CTARGET:-${CHOST}} + inherit eutils toolchain-funcs -EGIT_REPO_URI="git://github.com/golang/go.git" -inherit git-r3 -KEYWORDS="-* ~amd64 arm64" +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" + # Upstream only supports go on amd64, arm and x86 architectures. + KEYWORDS="-* ~amd64 ~arm ~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" +SLOT="0/${PV}" IUSE="" -DEPEND="" +DEPEND=">=dev-lang/go-bootstrap-1.4.1" RDEPEND="" +# These test data objects have writable/executable stacks. +QA_EXECSTACK=" + usr/lib/go/src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj + usr/lib/go/src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj" + # The tools in /usr/lib/go should not cause the multilib-strict check to fail. QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" @@ -27,33 +39,30 @@ QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" # stripped. STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a /usr/lib/go/pkg/darwin*/*.a" -build_arch() -{ - case "$CBUILD" in - aarch64*) echo arm64;; - x86_64*) echo amd64;; - esac -} - -same_arch() -{ - [[ "${ARCH}" = "$(build_arch)" ]] -} +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}"/go +fi src_prepare() { - + if [[ ${PV} != 9999 ]]; then + sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go || + die 'sed failed' + fi epatch_user } src_compile() { - export GOOS="linux" - export GOARCH="${ARCH}" - export GOROOT_BOOTSTRAP="/usr/lib/go1.4" + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4 export GOROOT_FINAL="${EPREFIX}"/usr/lib/go export GOROOT="$(pwd)" - export GOBIN=${GOROOT}/bin + export GOBIN="${GOROOT}/bin" + if [[ $CTARGET = armv5* ]] + then + export GOARM=5 + fi + tc-export CC cd src ./make.bash || die "build failed" @@ -61,8 +70,6 @@ src_compile() src_test() { - $(same_arch) || return 0; - cd src PATH="${GOBIN}:${PATH}" \ ./run.bash --no-rebuild --banner || die "tests failed" @@ -70,15 +77,7 @@ src_test() src_install() { - local bin_path - - if $(same_arch); then - bin_path=${GOBIN} - else - bin_path=${GOBIN}/${GOOS}_${GOARCH} - fi - - dobin ${bin_path}/* + dobin bin/* dodoc AUTHORS CONTRIBUTORS PATENTS README.md dodir /usr/lib/go @@ -92,6 +91,13 @@ src_install() fperms -R +x /usr/lib/go/pkg/tool } +pkg_preinst() +{ + has_version ' Date: Wed, 19 Aug 2015 17:51:43 -0700 Subject: [PATCH 2/5] dev-lang/go: implement more complete cross compilation support There are a few quirks with Go to deal with when cross-compiling: - Since DEPEND cannot distinguish cross-architecture dependencies the current ebuild cannot keyword all architectures it supports. This could be resolved in the future with a special use flag or other clever trick to drop go-bootstrap from DEPEND for cross builds. - GOHOST* and CC variables are CBUILD values. - GO* and *_FOR_TARGET variables are CHOST values. - Go can always be used as a cross-compiler so handling the CHOST!=CTARGET case isn't strictly required. We could provide a pre-built copy of the std library for CTARGET's architecture but I'm not sure if that would be useful or not. For now the ebuild just doesn't allow that case. Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558216 Gentoo-Commit: 0f4f3b8d200e15982e5e75f52f3c472d152cc4c9 --- .../coreos-overlay/dev-lang/go/go-9999.ebuild | 109 +++++++++++++++--- 1 file changed, 95 insertions(+), 14 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild index 882834358d..e69a483899 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.30 2015/07/06 16:21:21 williamh Exp $ +# $Id$ EAPI=5 +export CBUILD=${CBUILD:-${CHOST}} export CTARGET=${CTARGET:-${CHOST}} inherit eutils toolchain-funcs @@ -13,7 +14,8 @@ if [[ ${PV} = 9999 ]]; then inherit git-r3 else SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" - # Upstream only supports go on amd64, arm and x86 architectures. + # go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures. + # Allowing other bootstrap options would enable arm64 and ppc64 builds. KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" fi @@ -28,21 +30,80 @@ DEPEND=">=dev-lang/go-bootstrap-1.4.1" RDEPEND="" # These test data objects have writable/executable stacks. -QA_EXECSTACK=" - usr/lib/go/src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj - usr/lib/go/src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj" +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. -STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a /usr/lib/go/pkg/darwin*/*.a" +# 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 [[ ${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;; + *) 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() { if [[ ${PV} != 9999 ]]; then @@ -58,11 +119,19 @@ src_compile() export GOROOT_FINAL="${EPREFIX}"/usr/lib/go export GOROOT="$(pwd)" export GOBIN="${GOROOT}/bin" - if [[ $CTARGET = armv5* ]] - then - export GOARM=5 + + # 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 GOARCH=$(go_arch) + export GOOS=$(go_os) + export CC_FOR_TARGET=$(tc-getCC) + export CXX_FOR_TARGET=$(tc-getCXX) + if [[ ${ARCH} == arm ]]; then + export GOARM=$(go_arm) fi - tc-export CC cd src ./make.bash || die "build failed" @@ -70,6 +139,8 @@ src_compile() src_test() { + go_cross_compile && return 0 + cd src PATH="${GOBIN}:${PATH}" \ ./run.bash --no-rebuild --banner || die "tests failed" @@ -77,17 +148,27 @@ src_test() src_install() { - dobin bin/* + local bin_path="${GOBIN}" + if go_cross_compile; then + bin_path="${GOBIN}/$(go_tuple)" + fi + dobin "${bin_path}"/* dodoc AUTHORS CONTRIBUTORS PATENTS README.md - dodir /usr/lib/go + 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 pkg src + 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 } From a35f9bda1343792fad66a1b9ddfb566cb795af41 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 20 Aug 2015 19:21:21 -0500 Subject: [PATCH 3/5] dev-lang/go: fix go dist line options in test phase Change --no-rebuild to -no-rebuild and drop --banner in the test phase to match the documentation of go dist. Gentoo-Commit: fb870ae6f45993ea375d8d5381edb72ade271b06 --- .../src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild index e69a483899..691efef069 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild @@ -143,7 +143,7 @@ src_test() cd src PATH="${GOBIN}:${PATH}" \ - ./run.bash --no-rebuild --banner || die "tests failed" + ./run.bash -no-rebuild || die "tests failed" } src_install() From ccc2baf8895c7771edf14b729834656a12653e75 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 19 Aug 2015 17:56:24 -0700 Subject: [PATCH 4/5] dev-lang/go: only require go-bootstrap in the SDK itself --- .../src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild index 691efef069..3451e3f6f9 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild @@ -24,9 +24,9 @@ HOMEPAGE="http://www.golang.org" LICENSE="BSD" SLOT="0/${PV}" -IUSE="" +IUSE="cros_host" -DEPEND=">=dev-lang/go-bootstrap-1.4.1" +DEPEND="cros_host? ( >=dev-lang/go-bootstrap-1.4.1 )" RDEPEND="" # These test data objects have writable/executable stacks. From c6abd3396e1a625e9c55018fd3f6d34d53024f71 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 19 Aug 2015 17:58:45 -0700 Subject: [PATCH 5/5] dev-lang/go: add 1.5 release and arm64 kewword For now 1.5 is only stable on arm64, needs testing before we upgrade. --- .../src/third_party/coreos-overlay/dev-lang/go/Manifest | 1 + .../src/third_party/coreos-overlay/dev-lang/go/go-1.5.ebuild | 1 + .../third_party/coreos-overlay/dev-lang/go/go-9999.ebuild | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest create mode 120000 sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.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 new file mode 100644 index 0000000000..2b1a1c7850 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest @@ -0,0 +1 @@ +DIST go1.5.src.tar.gz 12045689 SHA256 be81abec996d5126c05f2d36facc8e58a94d9183a56f026fc9441401d80062db SHA512 dac657d3ce8226e247449ce8b0bf34bcacd2479764e29f04562bd07af0bd054a4b3b8d309898dc0775450005c9d077fd4cebb3d1831c9a09d3f093579e32d54f WHIRLPOOL 4cc1ea76c18255f15fd03943a92a29e2496b1d1a77b9dd105442f9c6f4c285f621dbbaa051f120c50679f9d8b03ffe49aa94b96cbdf8df84509fd6754e3f9690 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.ebuild new file mode 120000 index 0000000000..60dd6f5f74 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.5.ebuild @@ -0,0 +1 @@ +go-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild index 3451e3f6f9..3ecf179b95 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild @@ -14,9 +14,8 @@ if [[ ${PV} = 9999 ]]; then inherit git-r3 else SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" - # go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures. - # Allowing other bootstrap options would enable arm64 and ppc64 builds. - KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" + # 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"