From da7af440609229b269bea41a8041cb25da4f12e8 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 22 Mar 2017 15:52:44 +0100
Subject: build: require Go >= 1.7
We have decided to bump the requirement to Go 1.7 because it enables
subtests and allows dropping backwards-compatibility code. This is in
line with Go's support policy. Go 1.6 and earlier no longer receive
security updates.
---
.travis.yml | 8 --------
README.md | 2 +-
build/ci.go | 18 ++++--------------
build/env.sh | 3 +--
4 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 64343625d..5f3ff9d16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,6 @@ go_import_path: github.com/ethereum/go-ethereum
sudo: false
matrix:
include:
- - os: linux
- dist: trusty
- go: 1.5.4
- env:
- - GO15VENDOREXPERIMENT=1
- - os: linux
- dist: trusty
- go: 1.6.2
- os: linux
dist: trusty
go: 1.7.5
diff --git a/README.md b/README.md
index 3241d2250..34522fc06 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ For prerequisites and detailed build instructions please read the
[Installation Instructions](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum)
on the wiki.
-Building geth requires both a Go and a C compiler.
+Building geth requires both a Go (version 1.7 or later) and a C compiler.
You can install them using your favourite package manager.
Once the dependencies are installed, run
diff --git a/build/ci.go b/build/ci.go
index 914ce9eae..6761a4c88 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -162,9 +162,9 @@ func doInstall(cmdline []string) {
// Check Go version. People regularly open issues about compilation
// failure with outdated Go. This should save them the trouble.
- if runtime.Version() < "go1.4" && !strings.HasPrefix(runtime.Version(), "devel") {
+ if runtime.Version() < "go1.7" && !strings.HasPrefix(runtime.Version(), "devel") {
log.Println("You have Go version", runtime.Version())
- log.Println("go-ethereum requires at least Go version 1.4 and cannot")
+ log.Println("go-ethereum requires at least Go version 1.7 and cannot")
log.Println("be compiled with an earlier version. Please upgrade your Go installation.")
os.Exit(1)
}
@@ -219,16 +219,9 @@ func buildFlags(env build.Environment) (flags []string) {
flags = append(flags, "-tags", "opencl")
}
- // Since Go 1.5, the separator char for link time assignments
- // is '=' and using ' ' prints a warning. However, Go < 1.5 does
- // not support using '='.
- sep := " "
- if runtime.Version() > "go1.5" || strings.Contains(runtime.Version(), "devel") {
- sep = "="
- }
// Set gitCommit constant via link-time assignment.
if env.Commit != "" {
- flags = append(flags, "-ldflags", "-X main.gitCommit"+sep+env.Commit)
+ flags = append(flags, "-ldflags", "-X main.gitCommit="+env.Commit)
}
return flags
}
@@ -249,10 +242,7 @@ func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd {
cmd.Args = append(cmd.Args, []string{"-ldflags", "-extldflags -Wl,--allow-multiple-definition"}...)
}
}
- cmd.Env = []string{
- "GO15VENDOREXPERIMENT=1",
- "GOPATH=" + build.GOPATH(),
- }
+ cmd.Env = []string{"GOPATH=" + build.GOPATH()}
if arch == "" || arch == runtime.GOARCH {
cmd.Env = append(cmd.Env, "GOBIN="+GOBIN)
} else {
diff --git a/build/env.sh b/build/env.sh
index af560305b..3914555d1 100755
--- a/build/env.sh
+++ b/build/env.sh
@@ -20,8 +20,7 @@ fi
# Set up the environment to use the workspace.
GOPATH="$workspace"
-GO15VENDOREXPERIMENT=1
-export GOPATH GO15VENDOREXPERIMENT
+export GOPATH
# Run the command inside the workspace.
cd "$ethdir/go-ethereum"
--
cgit
From c6e6f1fec26833bffc7dd0c9e346fa6579f66dff Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 22 Mar 2017 15:59:02 +0100
Subject: build: remove support for the GO_OPENCL environment variable
We don't use the opencl build tag anymore.
---
build/ci.go | 4 ----
1 file changed, 4 deletions(-)
diff --git a/build/ci.go b/build/ci.go
index 6761a4c88..cb9c7a335 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -215,10 +215,6 @@ func doInstall(cmdline []string) {
}
func buildFlags(env build.Environment) (flags []string) {
- if os.Getenv("GO_OPENCL") != "" {
- flags = append(flags, "-tags", "opencl")
- }
-
// Set gitCommit constant via link-time assignment.
if env.Commit != "" {
flags = append(flags, "-ldflags", "-X main.gitCommit="+env.Commit)
--
cgit