From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD95A138334 for ; Sat, 16 Mar 2019 23:32:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADE7AE09D0; Sat, 16 Mar 2019 23:32:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89881E09D0 for ; Sat, 16 Mar 2019 23:32:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2369B335D0E for ; Sat, 16 Mar 2019 23:32:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 590C9559 for ; Sat, 16 Mar 2019 23:32:45 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1552779157.3e91f887a86531b786674c7ead1532b96e496134.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-go/go-tour/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-go/go-tour/go-tour-0_p20180810.ebuild X-VCS-Directories: dev-go/go-tour/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3e91f887a86531b786674c7ead1532b96e496134 X-VCS-Branch: master Date: Sat, 16 Mar 2019 23:32:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ebbe4036-04c7-41cd-890b-1095629226df X-Archives-Hash: 4a1cccf48bba79575c07e83ff4ff0de7 commit: 3e91f887a86531b786674c7ead1532b96e496134 Author: Zac Medico gentoo org> AuthorDate: Sat Mar 16 23:31:01 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 16 23:32:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e91f887 dev-go/go-tour: fix build with installed instance Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Zac Medico gentoo.org> dev-go/go-tour/go-tour-0_p20180810.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-go/go-tour/go-tour-0_p20180810.ebuild b/dev-go/go-tour/go-tour-0_p20180810.ebuild index 42d9aa99327..c5967f041fa 100644 --- a/dev-go/go-tour/go-tour-0_p20180810.ebuild +++ b/dev-go/go-tour/go-tour-0_p20180810.ebuild @@ -20,12 +20,16 @@ DEPEND="dev-go/go-net:= src_compile() { local x + # Create a temporary GOROOT, since otherwise the executable is not + # built if it happens to be installed already. + cp -rs "$(go env GOROOT)" "${T}/goroot" || die + rm -rf "${T}/goroot/"{pkg/tool/$(go env GOOS)_$(go env GOARCH)/tour,src/${EGO_PN%/...}} || die mkdir -p "${T}/golibdir/src/golang.org/x" || die for x in net tools; do ln -s "$(get_golibdir_gopath)/src/golang.org/x/${x}" "${T}/golibdir/src/golang.org/x/${x}" || die done export -n GOCACHE XDG_CACHE_HOME #567192 - GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \ + GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" GOROOT=${T}/goroot \ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" [[ -x bin/gotour ]] || die "gotour not found" }