diff options
Diffstat (limited to 'recipes-containers/containerd/files')
| -rw-r--r-- | recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch (renamed from recipes-containers/containerd/files/0001-containerd-shim-build-with-CGO.patch) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-containers/containerd/files/0001-containerd-shim-build-with-CGO.patch b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch index 3b890834..75a984be 100644 --- a/recipes-containers/containerd/files/0001-containerd-shim-build-with-CGO.patch +++ b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | From a1d2db9037b1302c4ce4cfc170a4fa443f68e594 Mon Sep 17 00:00:00 2001 | 1 | From e31acef290181434efaf47e70db7ad0d92dbe300 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> |
| 3 | Date: Thu, 29 Mar 2018 15:48:41 -0400 | 3 | Date: Thu, 19 Apr 2018 17:09:51 -0400 |
| 4 | Subject: [PATCH] containerd-shim: build with CGO | 4 | Subject: [PATCH] build: use oe provided GO and flags |
| 5 | 5 | ||
| 6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
| 7 | --- | 7 | --- |
| @@ -9,7 +9,7 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | |||
| 9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 10 | 10 | ||
| 11 | diff --git a/src/import/Makefile b/src/import/Makefile | 11 | diff --git a/src/import/Makefile b/src/import/Makefile |
| 12 | index 9d8cf8a18fbc..1dff4e3c2043 100644 | 12 | index 9d8cf8a18fbc..492d033fe2a7 100644 |
| 13 | --- a/src/import/Makefile | 13 | --- a/src/import/Makefile |
| 14 | +++ b/src/import/Makefile | 14 | +++ b/src/import/Makefile |
| 15 | @@ -134,7 +134,7 @@ bin/%: cmd/% FORCE | 15 | @@ -134,7 +134,7 @@ bin/%: cmd/% FORCE |
| @@ -17,7 +17,7 @@ index 9d8cf8a18fbc..1dff4e3c2043 100644 | |||
| 17 | bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 | 17 | bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 |
| 18 | @echo "$(WHALE) bin/containerd-shim" | 18 | @echo "$(WHALE) bin/containerd-shim" |
| 19 | - @CGO_ENABLED=0 go build -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim | 19 | - @CGO_ENABLED=0 go build -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim |
| 20 | + @go build -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim | 20 | + @$(GO) build -o bin/containerd-shim ${SHIM_GO_LDFLAGS} $(GOBUILDFLAGS) ${GO_TAGS} ./cmd/containerd-shim |
| 21 | 21 | ||
| 22 | binaries: $(BINARIES) ## build binaries | 22 | binaries: $(BINARIES) ## build binaries |
| 23 | @echo "$(WHALE) $@" | 23 | @echo "$(WHALE) $@" |
