MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker/proxy: don't use -linkshared unconditionally

Browse Source 
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 <jose.quaresma@foundries.io>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Jose Quaresma 2022-09-20 11:46:09 +00:00 committed by Bruce Ashfield
parent 758da82203
commit 2d0f7255a7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
recipes-containers/docker/docker.inc
View File

@ -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"

4
recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch
View File

@ -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.