mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
oci-runtime-tools: 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>
This commit is contained in:
parent
cc5e41ffb0
commit
f567afae0a
|
@ -0,0 +1,31 @@
|
|||
From b4ad9b2a57d6c736870657c06959ccc44b578f12 Mon Sep 17 00:00:00 2001
|
||||
From: Bruce Ashfield <bruce.ashfield@gmail.com>
|
||||
Date: Tue, 30 Jun 2020 23:47:08 -0400
|
||||
Subject: [PATCH] build: use for cross compiler
|
||||
|
||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
|
||||
---
|
||||
a/src/import/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/import/Makefile a/src/import/Makefile
|
||||
index 77626d2..c3a0760 100644
|
||||
--- a/src/import/Makefile
|
||||
+++ a/src/import/Makefile
|
||||
@@ -8,11 +8,11 @@ COMMIT=$(shell git rev-parse HEAD 2> /dev/null || true)
|
||||
all: tool runtimetest
|
||||
|
||||
tool:
|
||||
- go build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}" -o oci-runtime-tool ./cmd/oci-runtime-tool
|
||||
+ ${GO} build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}" -o oci-runtime-tool ./cmd/oci-runtime-tool
|
||||
|
||||
.PHONY: runtimetest
|
||||
runtimetest:
|
||||
- CGO_ENABLED=0 go build -installsuffix cgo -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest
|
||||
+ CGO_ENABLED=0 ${GO} build -installsuffix cgo -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest
|
||||
|
||||
.PHONY: man
|
||||
man:
|
||||
--
|
||||
2.19.1
|
||||
|
|
@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=b355a61a394a504dacde901c958f66
|
|||
|
||||
SRC_URI = "git://github.com/opencontainers/runtime-tools.git \
|
||||
file://0001-Revert-implement-add-set-function-for-hooks-items.patch \
|
||||
file://0001-build-use-for-cross-compiler.patch \
|
||||
"
|
||||
|
||||
SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb"
|
||||
|
|
Loading…
Reference in New Issue
Block a user