commit:     6b8aa7f8d6fe088fc68fde671bc20d5b061e0507
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 06:25:39 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 18:04:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8aa7f8

dev-lang/go: Unpack bootstrap archive for current platform only

Unpack the bootstrap archive for the current platform rather than
all bootstrap tarballs in SRC_URI.  This provides significant space
savings during build.

Closes: https://bugs.gentoo.org/680860
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 dev-lang/go/go-1.12.4.ebuild | 5 ++++-
 dev-lang/go/go-9999.ebuild   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-lang/go/go-1.12.4.ebuild b/dev-lang/go/go-1.12.4.ebuild
index 7e249d23dab..cda631645e8 100644
--- a/dev-lang/go/go-1.12.4.ebuild
+++ b/dev-lang/go/go-1.12.4.ebuild
@@ -157,8 +157,11 @@ src_unpack()
 {
        if [[ ${PV} = 9999 ]]; then
                git-r3_src_unpack
+       else
+               unpack "go${MY_PV}.src.tar.gz"
        fi
-       default
+       use gccgo ||
+               unpack "go-$(go_os ${CBUILD})-$(go_arch 
${CBUILD})-${BOOTSTRAP_VERSION}.tbz"
 }
 
 src_compile()

diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 4cb21b53d19..deea6d5a588 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -157,8 +157,11 @@ src_unpack()
 {
        if [[ ${PV} = 9999 ]]; then
                git-r3_src_unpack
+       else
+               unpack "go${MY_PV}.src.tar.gz"
        fi
-       default
+       use gccgo ||
+               unpack "go-$(go_os ${CBUILD})-$(go_arch 
${CBUILD})-${BOOTSTRAP_VERSION}.tbz"
 }
 
 src_compile()

Reply via email to