MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

riddler: fix 32bit ARM build

Browse Source 
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>
This commit is contained in:
Bruce Ashfield 2020-07-01 00:00:41 -04:00
parent f567afae0a
commit 14a9247a10
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch Normal file
View File

@ -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

5
recipes-containers/riddler/riddler_git.bb
View File

@ -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"