From 01bd2512283b43e381766e1e4068f8cfbf163ed9 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 7 Sep 2016 17:44:48 -0700
Subject: [PATCH 1/4] app-emulation/acbuild: fix ldflags for go1.7

---
 .../coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild
index 52463d2328..fa4762df3e 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild
@@ -34,9 +34,9 @@ src_compile(){
 		v=$(git describe --long --dirty) || die
 		v=${v#v}
 		v=${v/-/+}
-		GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version ${v}"
+		GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version=${v}"
 	else
-		GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version ${PV}"
+		GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version=${PV}"
 	fi
 
 	go_build "${COREOS_GO_PACKAGE}/acbuild"

From c025f3a3e943f242c310d5d8882acf56bf728ae6 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 7 Sep 2016 17:53:06 -0700
Subject: [PATCH 2/4] coreos-cloudinit: fix ldflags for go1.7

---
 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
index 2e15c384b0..baeaee2bd3 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 
 src_compile() {
 	export GO15VENDOREXPERIMENT="1"
-	GO_LDFLAGS="-X main.version $(git describe --dirty)" || die
+	GO_LDFLAGS="-X main.version=$(git describe --dirty)" || die
 	coreos-go_src_compile
 }
 

From c4f1e8cc18550135e7ac88ff4810fd1850e93545 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 7 Sep 2016 17:53:30 -0700
Subject: [PATCH 3/4] coreos-metadata: fix ldflags for go1.7

---
 .../coreos-base/coreos-metadata/coreos-metadata-9999.ebuild     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
index d99776f792..b02f3e183a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
@@ -25,7 +25,7 @@ IUSE=""
 
 src_compile() {
 	export GO15VENDOREXPERIMENT="1"
-	GO_LDFLAGS="-X main.version $(git describe --dirty)" || die
+	GO_LDFLAGS="-X main.version=$(git describe --dirty)" || die
 	go_build "${COREOS_GO_PACKAGE}/internal"
 }
 

From 28839780e7cab7a262be7e623a4e156dbacc784c Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 7 Sep 2016 18:02:00 -0700
Subject: [PATCH 4/4] dev-db/etcd: fix ldflags for go1.7

---
 .../src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
index a8503f564f..d88bc61a21 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
@@ -31,7 +31,7 @@ RDEPEND="!dev-db/etcd:0
 	!dev-db/etcdctl"
 
 src_compile() {
-	GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.GitSHA ${CROS_WORKON_COMMIT:0:7}"
+	GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.GitSHA=${CROS_WORKON_COMMIT:0:7}"
 	go_build "${COREOS_GO_PACKAGE}"
 	go_build "${COREOS_GO_PACKAGE}/etcdctl"
 }