diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-06-30 23:21:42 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-07-01 12:43:16 -0400 |
commit | 929372946aeb85953d1ca6acc428d73fbac52a56 (patch) | |
tree | 8198a14178180fc5c522a7a4756e74938497555f /recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch | |
parent | 9726c5d16420c525afe6045665c6aeaf424d9cc6 (diff) | |
download | meta-virtualization-929372946aeb85953d1ca6acc428d73fbac52a56.tar.gz |
docker-ce/docker-moby: fixup GO compiler calls
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>
| ^~~~~~~~~~~~~~~~~~
This commit also moves the docker-ce patches from "files" to a named
directory to reduce confusion.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch')
-rw-r--r-- | recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch b/recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch new file mode 100644 index 00000000..d9cdfb01 --- /dev/null +++ b/recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From bbf600cc4d46c3f7ec0c1b486790a2402d41f550 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Tue, 30 Jun 2020 22:23:33 -0400 | ||
4 | Subject: [PATCH] dynbinary: use go cross compiler | ||
5 | |||
6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
7 | --- | ||
8 | hack/make/.binary | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/src/import/hack/make/.binary b/src/import/hack/make/.binary | ||
12 | index 53de6749e5..47ab2a754f 100644 | ||
13 | --- a/src/import/hack/make/.binary | ||
14 | +++ b/src/import/hack/make/.binary | ||
15 | @@ -81,7 +81,7 @@ esac | ||
16 | |||
17 | echo "Building: $DEST/$BINARY_FULLNAME" | ||
18 | echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\"" | ||
19 | -go build \ | ||
20 | +${GO} build \ | ||
21 | -o "$DEST/$BINARY_FULLNAME" \ | ||
22 | "${BUILDFLAGS[@]}" \ | ||
23 | -ldflags " | ||
24 | -- | ||
25 | 2.19.1 | ||
26 | |||