go: Updated to 1.6 (now compiles for me)

Depends on GCC built with 'GO' (gccgo) for bootstrapping.
 PRE_BUILD, 10-disable-ping-test.patch: Removed
Set GOROOT_BOOTSTRAP to use gccgo from gcc

8 files changed, 19 insertions, 32 deletions

diff --git a/devel/go/10-disable-ping-test.patch b/devel/go/10-disable-ping-test.patch
deleted file mode 100644
index d7bb462b81..0000000000
--- a/devel/go/10-disable-ping-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Updated from https://github.com/golang/go/commit/f97f876125f72f543a14f57fb6570dee6bfa2c6f
-# to fix https://github.com/golang/go/issues/10730
-
-diff -Naur go.orig/src/net/file_test.go go/src/net/file_test.go
---- go.orig/src/net/file_test.go	2015-02-17 20:38:34.000000000 -0800
-+++ go/src/net/file_test.go	2015-05-26 20:49:02.517759670 -0700
-@@ -174,7 +174,8 @@
- 
- 	{net: "udp6", addr: "[::1]", ipv6: true},
- 
--	{net: "ip4:icmp", addr: "127.0.0.1"},
-+	// TODO(mikioh,bradfitz): renable once 10730 is fixed
-+	// {net: "ip4:icmp", addr: "127.0.0.1"},
- 
- 	{net: "unixgram", addr: "@gotest3/net", linux: true},
- }
diff --git a/devel/go/BUILD b/devel/go/BUILD
index c0d99e9e16..90d733e017 100755
--- a/devel/go/BUILD
+++ b/devel/go/BUILD
@@ -1,9 +1,10 @@
-export GOROOT=${SOURCE_DIRECTORY}          &&
-export GOROOT_FINAL=${TARGET_ROOT}/opt/go  &&
-export GOARCH                              &&
-export GOOS=linux                          &&
-export GOBIN=${INSTALL_ROOT}/usr/bin/      &&
-cd ${SOURCE_DIRECTORY}/src                 &&
+export GOROOT=${SOURCE_DIRECTORY}            &&
+export GOROOT_BOOTSTRAP="${TRACK_ROOT}"/usr  &&
+export GOROOT_FINAL=${TARGET_ROOT}/opt/go    &&
+export GOARCH                                &&
+export GOOS=linux                            &&
+export GOBIN=${INSTALL_ROOT}/usr/bin/        &&
+cd ${SOURCE_DIRECTORY}/src                   &&
 
 check_tmp_noexec /tmp &&
 ./all.bash &&
diff --git a/devel/go/DEPENDS b/devel/go/DEPENDS
index 3a9370dd21..354fda45cd 100755
--- a/devel/go/DEPENDS
+++ b/devel/go/DEPENDS
@@ -1,5 +1,5 @@
-depends SYSTEM-LOGGER &&
-depends bison         &&
-depends gcc           &&
-depends AWK          &&
-depends make  
+depends SYSTEM-LOGGER  &&
+depends bison          &&
+depends -sub 'GO' gcc  &&
+depends AWK            &&
+depends make
diff --git a/devel/go/DETAILS b/devel/go/DETAILS
index 912897c92f..4b5e7a1b81 100755
--- a/devel/go/DETAILS
+++ b/devel/go/DETAILS
@@ -1,5 +1,5 @@
            SPELL="go"
-         VERSION=1.4.3
+         VERSION=1.6
           SOURCE="${SPELL}${VERSION}.src.tar.gz"
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
    SOURCE_URL[0]="https://storage.googleapis.com/golang/${SOURCE}"
diff --git a/devel/go/HISTORY b/devel/go/HISTORY
index b0a3eab1bd..5bb2e540f1 100644
--- a/devel/go/HISTORY
+++ b/devel/go/HISTORY
@@ -1,3 +1,9 @@
+2016-03-23 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 1.6 (now compiles for me)
+	* DEPENDS: Depends on GCC built with 'GO' (gccgo) for bootstrapping.
+	* PRE_BUILD, 10-disable-ping-test.patch: Removed
+	* BUILD: Set GOROOT_BOOTSTRAP to use gccgo from gcc
+
 2015-10-02 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 1.4.3
 
diff --git a/devel/go/PRE_BUILD b/devel/go/PRE_BUILD
deleted file mode 100755
index dc72792dcb..0000000000
--- a/devel/go/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build  &&
-cd  "${SOURCE_DIRECTORY}"  &&
-message "${MESSAGE_COLOR}Disabling ping test to work around Go bug #10730 ...${DEFAULT_COLOR}"  &&
-patch -p1 < "${SCRIPT_DIRECTORY}"/10-disable-ping-test.patch
diff --git a/devel/go/go1.4.3.src.tar.gz.sig b/devel/go/go1.4.3.src.tar.gz.sig
deleted file mode 100644
index 7f89f0e71b..0000000000
--- a/devel/go/go1.4.3.src.tar.gz.sig
+++ /dev/null
diff --git a/devel/go/go1.6.src.tar.gz.sig b/devel/go/go1.6.src.tar.gz.sig
new file mode 100644
index 0000000000..6eecd2f004
--- /dev/null
+++ b/devel/go/go1.6.src.tar.gz.sig