From 2bb87e4e0781770103979fa21aeb59a7c6295e3e Mon Sep 17 00:00:00 2001
From: Dominik Honnef <dominik@honnef.co>
Date: Sat, 22 Aug 2015 20:42:02 +0200
Subject: [PATCH] build-style/go: don't set GOBIN

Go 1.5 doesn't permit our use of GOBIN anymore, breaking
cross-compilation (for details, see
https://github.com/golang/go/issues/9769)

In retrospect, I'm not sure why we set GOBIN in the first place;
GOPATH/bin should suffice.

Closes #2337
---
 common/build-style/go.sh             | 2 +-
 common/environment/build-style/go.sh | 1 -
 srcpkgs/packer/template              | 5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index 8f1d0b5c16..679bc5df0d 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -14,7 +14,7 @@ do_build() {
 }
 
 do_install() {
-	find "${GOBIN}" -type f -executable | while read line
+	find "${GOPATH}/bin" -type f -executable | while read line
 	do
 		vbin "${line}"
 	done
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 9342f39fd1..ba05061ed1 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -12,4 +12,3 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 export GOPATH="${wrksrc}/_build-${pkgname}-xbps"
-export GOBIN="${wrksrc}/_build-${pkgname}-xbps-bin"
diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 10a1faca27..b4b3b0dda8 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,11 +1,10 @@
 # Template file for 'packer'
 pkgname=packer
 version=0.8.6
-revision=2
+revision=3
 replaces="packer-bin>=0"
 short_desc="Create identical multiplatform machine images from a single source"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
-nocross=yes # temporary hack for #2337
 build_style=go
 hostmakedepends="git"
 license="MPL-2"
@@ -21,7 +20,7 @@ post_build() {
 }
 
 do_install() {
-	find "${GOBIN}" -type f -executable | while read line
+	find "${GOPATH}/bin" -type f -executable | while read line
 	do
 		if [[ $(basename $line) == packer ]]; then
 			vbin $line