Attachment #428486 for bug #576290




inherit toolchain-funcs

BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
SRC_URI="!gccgo? (
kernel_Darwin? (
	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
)

kernel_SunOS? (
	x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )
)
)
"

if [[ ${PV} = 9999 ]]; then


LICENSE="BSD"
SLOT="0/${PV}"
IUSE="gccgo"

DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
RDEPEND="!<dev-go/go-tools-0_pre20150902"

# These test data objects have writable/executable stacks.

src_compile()
{
	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
	if use gccgo; then
		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
		ln -s "$(echo "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-5 | tail -n1)" "${GOROOT_BOOTSTRAP}/bin/go"
	fi
	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
	export GOROOT="$(pwd)"
	export GOBIN="${GOROOT}/bin"

Lines 1684-1693 toolchain_src_install() { Link Here

(-)a/eclass/toolchain.eclass (-2 / +4 lines)
1684	ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}	1684	ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
1685	fi	1685	fi
1686	done	1686	done
1687	# Clear out the main go binaries as we don't want to clobber dev-lang/go	1687	# Rename the main go binaries as we don't want to clobber dev-lang/go
1688	# when gcc-config runs. #567806	1688	# when gcc-config runs. #567806
1689	if tc_version_is_at_least 5 && is_go ; then	1689	if tc_version_is_at_least 5 && is_go ; then
1690	rm -f go gofmt	1690	for x in go gofmt; do
		1691	mv ${x} ${x}-5 \|\| die
		1692	done
1691	fi	1693	fi
1692		1694
1693	# Now do the fun stripping stuff	1695	# Now do the fun stripping stuff

Return to bug 576290

Lines 12-18 MY_PV=${PV/_/} Link Here

(-)a/dev-lang/go/go-1.6-r2.ebuild (-3 / +8 lines)
12	inherit toolchain-funcs	12	inherit toolchain-funcs
13		13
14	BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"	14	BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
15	SRC_URI="	15	SRC_URI="!gccgo? (
16	kernel_Darwin? (	16	kernel_Darwin? (
17	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )	17	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
18	)	18	)
Lines 30-35 kernel_linux? ( Link Here
30	kernel_SunOS? (	30	kernel_SunOS? (
31	x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )	31	x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )
32	)	32	)
		33	)
33	"	34	"
34		35
35	if [[ ${PV} = 9999 ]]; then	36	if [[ ${PV} = 9999 ]]; then
Lines 52-60 HOMEPAGE="http://www.golang.org" Link Here
52		53
53	LICENSE="BSD"	54	LICENSE="BSD"
54	SLOT="0/${PV}"	55	SLOT="0/${PV}"
55	IUSE=""	56	IUSE="gccgo"
56		57
57	DEPEND=""	58	DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
58	RDEPEND="!<dev-go/go-tools-0_pre20150902"	59	RDEPEND="!<dev-go/go-tools-0_pre20150902"
59		60
60	# These test data objects have writable/executable stacks.	61	# These test data objects have writable/executable stacks.
Lines 146-151 src_unpack() Link Here
146	src_compile()	147	src_compile()
147	{	148	{
148	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap	149	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
		150	if use gccgo; then
		151	mkdir -p "${GOROOT_BOOTSTRAP}/bin" \|\| die
		152	ln -s "$(echo "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-5 \| tail -n1)" "${GOROOT_BOOTSTRAP}/bin/go"
		153	fi
149	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go	154	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
150	export GOROOT="$(pwd)"	155	export GOROOT="$(pwd)"
151	export GOBIN="${GOROOT}/bin"	156	export GOBIN="${GOROOT}/bin"