diff options
Diffstat (limited to 'recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch')
| -rw-r--r-- | recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch | 26 |
1 files changed, 15 insertions, 11 deletions
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 c623b260..f94f73e4 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 @@ -6,6 +6,8 @@ Subject: [PATCH] libnetwork: use $(GO) instead of go Ensure that the libnetwork makefile uses the go cross flags and utilities. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- Makefile | 14 +++++++------- @@ -15,27 +17,29 @@ Index: git/libnetwork/Makefile =================================================================== --- git.orig/libnetwork/Makefile +++ git/libnetwork/Makefile -@@ -45,9 +45,9 @@ +@@ -45,10 +45,10 @@ build-local: @echo "🐳 $@" @mkdir -p "bin" -- go build -tags experimental -o "bin/dnet" ./cmd/dnet -- go build -o "bin/docker-proxy" ./cmd/proxy +- GO111MODULE=off go build -tags experimental -o "bin/dnet" ./cmd/dnet +- GO111MODULE=off go build -o "bin/docker-proxy" ./cmd/proxy - CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic -+ $(GO) build -tags experimental -o "bin/dnet" ./cmd/dnet -+ $(GO) build -o "bin/proxy" ./cmd/proxy -+ CGO_ENABLED=0 $(GO) build -o "bin/diagnosticClient" ./cmd/diagnostic - CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go +- CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go ++ GO111MODULE=off $(GO) build -trimpath -tags experimental -o "bin/dnet" ./cmd/dnet ++ GO111MODULE=off $(GO) build -trimpath -o "bin/docker-proxy" ./cmd/proxy ++ CGO_ENABLED=0 $(GO) build -trimpath -o "bin/diagnosticClient" ./cmd/diagnostic ++ CGO_ENABLED=0 $(GO) build -trimpath -o "bin/testMain" ./cmd/networkdb-test/testMain.go build-images: + @echo "🐳 $@" @@ -82,8 +82,8 @@ cross-local: @echo "🐳 $@" -- go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet -- go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy -+ @$(GO) build -linkshared $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy -+ @$(GO) build -linkshared $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet +- GO111MODULE=off go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet +- GO111MODULE=off go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy ++ GO111MODULE=off $(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet ++ GO111MODULE=off $(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy # Rebuild protocol buffers. # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt. |