diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
| commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
| tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-lang/go | |
| parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) | |
gentoo resync : 02.08.2019
Diffstat (limited to 'dev-lang/go')
| -rw-r--r-- | dev-lang/go/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/go/go-9999.ebuild | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index 5101d2fc2688..142aa7d01211 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -19,5 +19,5 @@ EBUILD go-1.11.12.ebuild 6451 BLAKE2B de8659b981b3ae812cdcbd4816f4efa33ca8f29b94 EBUILD go-1.12.5.ebuild 6459 BLAKE2B 11cc998ff708a26c833e7ac2ff72c7fd2aabf0e3a3bfaa7558820d4726e29e22e5d0ad0b3100bd8e982b54074fc1230a43d288cf873810024a3fa1b3b77450e5 SHA512 deff55ebb12c4a915b439a1d598e02b8fd03a1d1ee873f9e6f47c6ff22cef82c3624aa68eac89968a3f01f7b91794d501675a59871fe9dd022fb2ee8cd29cd26 EBUILD go-1.12.6.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f EBUILD go-1.12.7.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f -EBUILD go-9999.ebuild 6100 BLAKE2B d914cb9513a17d71a7c10aebc4140f955fd6a8e0b0af645173e81f93379d39b3da233078029f5c322d02c1d59983de2e63ef7dae6f65ba6f2dec899d130b6c08 SHA512 820e2e88641a2218a3599ca23ef2d8767777638d9d08fcce36168d09679b72041b8b5fd4caa177b388e3445041da3e68f1785d2cfc2b4cc969c8d41c9864c680 +EBUILD go-9999.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 8c8928317700..a6151a8c829b 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.ebuild @@ -48,20 +48,20 @@ case ${PV} in esac esac -# If gccgo is not being used to build Go, there is no way to know the -# architecture or operating system of the build machine, so we need to -# download all of our bootstrap archives to allow this ebuild to work -# under crossdev. +# If gccgo or a previously installed version of dev-lang/go is not being +# used to build Go, there is no way to know the architecture or operating system +# of the build machine, so we need to download all of our bootstrap +# archives to allow this ebuild to work under crossdev. # # https://bugs.gentoo.org/671394 -SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )" +SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )" DESCRIPTION="A concurrent garbage collected and typesafe programming language" HOMEPAGE="https://golang.org" LICENSE="BSD" SLOT="0/${PV}" -IUSE="gccgo" +IUSE="gccgo system-bootstrap" BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )" RDEPEND="!<dev-go/go-tools-0_pre20150902" @@ -151,6 +151,9 @@ pkg_pretend() if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}" fi + [[ ${MERGE_TYPE} != binary ]] && + use system-bootstrap && ! has_version "dev-lang/go" && + die "dev-lang/go must be installed to use the system-bootstrap use flag" } src_unpack() @@ -160,7 +163,7 @@ src_unpack() else unpack "go${MY_PV}.src.tar.gz" fi - use gccgo || + use gccgo || use system-bootstrap || unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz" } @@ -176,6 +179,8 @@ src_compile() [[ -x ${go_binary} ]] || die "go-$(gcc-major-version): command not found" ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die + elif use system-bootstrap; then + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go fi export GOROOT_FINAL="${EPREFIX}"/usr/lib/go export GOROOT="$(pwd)" |