diff options
| author |   William Hubbs <williamh@gentoo.org> | 2015-01-20 04:02:26 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2015-01-20 04:02:26 +0000 |
| commit | 59c4252698a59ca12b228218fa6480eb5aa2fb20 (patch) | |
| tree | 6d856ed8bd778587ec2b7457f4c7dd4c00e6221a /dev-lang | |
| parent | Initial commit of go-bootstrap for bug #536960. (diff) | |
| download | gentoo-2-59c4252698a59ca12b228218fa6480eb5aa2fb20.tar.gz gentoo-2-59c4252698a59ca12b228218fa6480eb5aa2fb20.tar.bz2 gentoo-2-59c4252698a59ca12b228218fa6480eb5aa2fb20.zip | |
Add a dependency on dev-lang/go-bootstrap for #536960. For now, we can build our own bootstrap compiler, so we dont
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/go/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/go/go-9999.ebuild | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-lang/go/ChangeLog b/dev-lang/go/ChangeLog index 2ee9ab54aa11..6fbde6c3073c 100644 --- a/dev-lang/go/ChangeLog +++ b/dev-lang/go/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/go # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.63 2015/01/16 16:12:27 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.64 2015/01/20 04:02:26 williamh Exp $ + + 20 Jan 2015; William Hubbs <williamh@gentoo.org> go-9999.ebuild: + Add a dependency on dev-lang/go-bootstrap for #536960. For now, we can build + our own bootstrap compiler, so we dont *go-1.4.1 (16 Jan 2015) diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 61e437bc4872..ef464d0cb647 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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.24 2014/12/31 01:00:46 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.25 2015/01/20 04:02:26 williamh Exp $ EAPI=5 @@ -24,7 +24,7 @@ LICENSE="BSD" SLOT="0" IUSE="" -DEPEND="" +DEPEND=">=dev-lang/go-bootstrap-1.4.1" RDEPEND="" # The tools in /usr/lib/go should not cause the multilib-strict check to fail. @@ -41,13 +41,15 @@ fi src_prepare() { if [[ ${PV} != 9999 ]]; then - epatch "${FILESDIR}"/${PN}-1.2-no-Werror.patch + sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go || + die 'sed failed' fi epatch_user } src_compile() { + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4 export GOROOT_FINAL="${EPREFIX}"/usr/lib/go export GOROOT="$(pwd)" export GOBIN="${GOROOT}/bin" |