From 2d0f7255a75d24ec3e3b686d70e97d20dc39c259 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Tue, 20 Sep 2022 11:46:09 +0000 Subject: docker/proxy: don't use -linkshared unconditionally The linkshared is not supported in some machines like riscv64 and when supported we can use the GO_LINKSHARED instaed. So export GO_LINKSHARED on the recipe to be available for Makefile. This is currently only used in libnetwork for the proxy build, but could be used in additional locations in the future. Signed-off-by: Jose Quaresma Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker.inc | 3 +++ .../docker/files/0001-libnetwork-use-GO-instead-of-go.patch | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'recipes-containers') diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index b0bee4f0..9708eaf7 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -58,6 +58,9 @@ inherit pkgconfig do_configure[noexec] = "1" +# Export for possible use in Makefiles, default value comes from go.bbclass +export GO_LINKSHARED + DOCKER_PKG="github.com/docker/docker" # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056 BUILD_TAGS ?= "exclude_graphdriver_btrfs exclude_graphdriver_devicemapper" diff --git a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch index d4f84e30..b9b41de5 100644 --- a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch +++ b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch @@ -34,8 +34,8 @@ Index: git/libnetwork/Makefile @echo "🐳 $@" - go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet - go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy -+ @$(GO) build -trimpath -linkshared $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy -+ @$(GO) build -trimpath -linkshared $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet ++ @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy ++ @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet # Rebuild protocol buffers. # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt. -- cgit v1.2.3-54-g00ecf