From 14a9247a1026842e9f813fe6f20e7c4ffd54bfb9 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 1 Jul 2020 00:00:41 -0400
Subject: riddler: fix 32bit ARM build

With oe-core commit c23f9e80492e4b [tcmode-default: use
go-binary-native by default], we must explictly call the proper
cross go binary, versus just the go-native variant.

These builds were working by luck, since the go compiler was capable
of building the target binaries previously (in its build-from-source
creation). We fixup the calls and we no longer see fpu build issues:

  fatal error: gnu/stubs-soft.h: No such file or directory

    7 | # include <gnu/stubs-soft.h>
      |           ^~~~~~~~~~~~~~~~~~

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../0001-build-use-to-select-cross-compiler.patch  | 51 ++++++++++++++++++++++
 recipes-containers/riddler/riddler_git.bb          |  5 ++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch

(limited to 'recipes-containers/riddler')

diff --git a/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch b/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch
new file mode 100644
index 00000000..8098562e
--- /dev/null
+++ b/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch
@@ -0,0 +1,51 @@
+From 8ca4391a5954db168d513ba64c3791f63b044fbf Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Tue, 30 Jun 2020 23:58:22 -0400
+Subject: [PATCH] build: use  to select cross compiler
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ git/src/import/Makefile | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git git/src/import/Makefile git/src/import/Makefile
+index c6976af..f3c8d17 100644
+--- git/src/import/Makefile
++++ git/src/import/Makefile
+@@ -10,11 +10,11 @@ all: clean build static fmt lint test vet
+ 
+ build:
+ 	@echo "+ $@"
+-	@go build -tags "$(BUILDTAGS) cgo" .
++	@${GO} build -tags "$(BUILDTAGS) cgo" .
+ 
+ static:
+ 	@echo "+ $@"
+-	CGO_ENABLED=1 go build -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler .
++	CGO_ENABLED=1 ${GO} build -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler .
+ 
+ fmt:
+ 	@echo "+ $@"
+@@ -26,11 +26,11 @@ lint:
+ 
+ test: fmt lint vet
+ 	@echo "+ $@"
+-	@go test -v -tags "$(BUILDTAGS) cgo" $(shell go list ./... | grep -v vendor)
++	@${GO} test -v -tags "$(BUILDTAGS) cgo" $(shell go list ./... | grep -v vendor)
+ 
+ vet:
+ 	@echo "+ $@"
+-	@go vet $(shell go list ./... | grep -v vendor)
++	@${GO} vet $(shell go list ./... | grep -v vendor)
+ 
+ clean:
+ 	@echo "+ $@"
+@@ -38,4 +38,4 @@ clean:
+ 
+ install:
+ 	@echo "+ $@"
+-	@go install -v .
++	@${GO} install -v .
+-- 
+2.19.1
+
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb
index 08976060..8f71649b 100644
--- a/recipes-containers/riddler/riddler_git.bb
+++ b/recipes-containers/riddler/riddler_git.bb
@@ -3,7 +3,10 @@ SUMMARY = "Convert `docker inspect` to opencontainers (OCI compatible) runc spec
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1"
 
-SRC_URI = "git://github.com/jfrazelle/riddler;branch=master"
+SRC_URI = "git://github.com/jfrazelle/riddler;branch=master \
+           file://0001-build-use-to-select-cross-compiler.patch \
+          "
+
 SRCREV = "23befa0b232877b5b502b828e24161d801bd67f6"
 PV = "0.1.0+git${SRCPV}"
 GO_IMPORT = "import"
-- 
cgit v1.2.3-54-g00ecf