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-cli-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-cli-use-go-cross-compiler.patch')
-rw-r--r-- | recipes-containers/docker/docker-moby/0001-cli-use-go-cross-compiler.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/recipes-containers/docker/docker-moby/0001-cli-use-go-cross-compiler.patch b/recipes-containers/docker/docker-moby/0001-cli-use-go-cross-compiler.patch new file mode 100644 index 00000000..9419d547 --- /dev/null +++ b/recipes-containers/docker/docker-moby/0001-cli-use-go-cross-compiler.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From ae6f4a1e685394fb7b9539f134b66ca84ddc91c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Tue, 30 Jun 2020 22:19:56 -0400 | ||
4 | Subject: [PATCH] cli: use go cross compiler | ||
5 | |||
6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
7 | --- | ||
8 | git/cli/scripts/build/dynbinary | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git git/cli/scripts/build/dynbinary git/cli/scripts/build/dynbinary | ||
12 | index 4feb7e71d8..f990d0e040 100755 | ||
13 | --- git/cli/scripts/build/dynbinary | ||
14 | +++ git/cli/scripts/build/dynbinary | ||
15 | @@ -9,6 +9,6 @@ source ./scripts/build/.variables | ||
16 | |||
17 | echo "Building dynamically linked $TARGET" | ||
18 | export CGO_ENABLED=1 | ||
19 | -go build -o "${TARGET}" -tags pkcs11 --ldflags "${LDFLAGS}" -buildmode=pie "${SOURCE}" | ||
20 | +${GO} build -o "${TARGET}" -tags pkcs11 --ldflags "${LDFLAGS}" -buildmode=pie "${SOURCE}" | ||
21 | |||
22 | ln -sf "$(basename "${TARGET}")" build/docker | ||
23 | -- | ||
24 | 2.19.1 | ||
25 | |||