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 | 22 |
1 files changed, 12 insertions, 10 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 10b180b6..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 | |||
| @@ -17,27 +17,29 @@ Index: git/libnetwork/Makefile | |||
| 17 | =================================================================== | 17 | =================================================================== |
| 18 | --- git.orig/libnetwork/Makefile | 18 | --- git.orig/libnetwork/Makefile |
| 19 | +++ git/libnetwork/Makefile | 19 | +++ git/libnetwork/Makefile |
| 20 | @@ -45,9 +45,9 @@ | 20 | @@ -45,10 +45,10 @@ |
| 21 | build-local: | 21 | build-local: |
| 22 | @echo "🐳 $@" | 22 | @echo "🐳 $@" |
| 23 | @mkdir -p "bin" | 23 | @mkdir -p "bin" |
| 24 | - go build -tags experimental -o "bin/dnet" ./cmd/dnet | 24 | - GO111MODULE=off go build -tags experimental -o "bin/dnet" ./cmd/dnet |
| 25 | - go build -o "bin/docker-proxy" ./cmd/proxy | 25 | - GO111MODULE=off go build -o "bin/docker-proxy" ./cmd/proxy |
| 26 | - CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic | 26 | - CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic |
| 27 | + $(GO) build -trimpath -tags experimental -o "bin/dnet" ./cmd/dnet | 27 | - CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go |
| 28 | + $(GO) build -trimpath -o "bin/proxy" ./cmd/proxy | 28 | + GO111MODULE=off $(GO) build -trimpath -tags experimental -o "bin/dnet" ./cmd/dnet |
| 29 | + GO111MODULE=off $(GO) build -trimpath -o "bin/docker-proxy" ./cmd/proxy | ||
| 29 | + CGO_ENABLED=0 $(GO) build -trimpath -o "bin/diagnosticClient" ./cmd/diagnostic | 30 | + CGO_ENABLED=0 $(GO) build -trimpath -o "bin/diagnosticClient" ./cmd/diagnostic |
| 30 | CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go | 31 | + CGO_ENABLED=0 $(GO) build -trimpath -o "bin/testMain" ./cmd/networkdb-test/testMain.go |
| 31 | 32 | ||
| 32 | build-images: | 33 | build-images: |
| 34 | @echo "🐳 $@" | ||
| 33 | @@ -82,8 +82,8 @@ | 35 | @@ -82,8 +82,8 @@ |
| 34 | 36 | ||
| 35 | cross-local: | 37 | cross-local: |
| 36 | @echo "🐳 $@" | 38 | @echo "🐳 $@" |
| 37 | - go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet | 39 | - GO111MODULE=off go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet |
| 38 | - go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy | 40 | - GO111MODULE=off go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy |
| 39 | + @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy | 41 | + GO111MODULE=off $(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet |
| 40 | + @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet | 42 | + GO111MODULE=off $(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy |
| 41 | 43 | ||
| 42 | # Rebuild protocol buffers. | 44 | # Rebuild protocol buffers. |
| 43 | # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt. | 45 | # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt. |