2 files changed, 34 insertions, 2 deletions

diff --git a/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch b/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch
new file mode 100644
index 00000000..7e0b2a11
--- /dev/null
+++ b/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch
@@ -0,0 +1,31 @@
+From 7e6bfc9657f9fd83c170d5bf3721d54bf9e88074 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Sun, 13 Oct 2019 15:35:08 -0400
+Subject: [PATCH] tool: respect GO and GOBUILDFLAGS when building
+
+Ensure that the building of the tools respect the go compiler and
+build flags from our environemnt. Otherwise, we'll use the host
+settings for each and end up with a binary that cannot be run on
+the target.
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import/Makefile b/src/import/Makefile
+index bacb341..1bfe021 100644
+--- a/src/import/Makefile
++++ b/src/import/Makefile
+@@ -27,7 +27,7 @@ check-license:
+ 
+ .PHONY: tool
+ tool:
+-       go build -ldflags "-X main.gitCommit=${COMMIT}" -o oci-image-tool ./cmd/oci-image-tool
++       $(GO) build $(GOBUILDFLAGS) $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT}" -o oci-image-tool ./cmd/oci-image-tool
+ 
+ 
+ all: tool man
+-- 
+2.19.1
+
diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
index a1ea9408..676f3cc4 100644
--- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
+++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
@@ -13,9 +13,10 @@ DEPENDS = "\
           "
 
 SRC_URI = "git://github.com/opencontainers/image-tools.git \
-           file://0001-config-make-Config.User-mapping-errors-a-warning.patch"
+           file://0001-config-make-Config.User-mapping-errors-a-warning.patch \
+           file://0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch"
 
-SRCREV = "e324098b70c87495404be6f341be459d2dfde64e"
+SRCREV = "93db3b16e6738bf9b8bee47d86ac93be5340838b"
 PV = "0.2.0-dev+git${SRCPV}"
 GO_IMPORT = "import"