diff options
Diffstat (limited to 'testing/step-certificates/01-Makefile-GOFLAGS.patch')
| -rw-r--r-- | testing/step-certificates/01-Makefile-GOFLAGS.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/testing/step-certificates/01-Makefile-GOFLAGS.patch b/testing/step-certificates/01-Makefile-GOFLAGS.patch deleted file mode 100644 index e2aab0d0b43..00000000000 --- a/testing/step-certificates/01-Makefile-GOFLAGS.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Charles Wimmer <charles@wimmer.net> - -This patch fixes some shell quoting issues. GOFLAGS was not being honored. - ---- - -diff -aur a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -86,7 +86,7 @@ - - DATE := $(shell date -u '+%Y-%m-%d %H:%M UTC') - LDFLAGS := -ldflags='-w -X "main.Version=$(VERSION)" -X "main.BuildTime=$(DATE)"' --GOFLAGS := CGO_ENABLED=0 -+_GOFLAGS := CGO_ENABLED=0 - - download: - $Q go mod download -@@ -96,23 +96,23 @@ - - $(PREFIX)bin/$(BINNAME): download $(call rwildcard,*.go) - $Q mkdir -p $(@D) -- $Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o $(PREFIX)bin/$(BINNAME) $(LDFLAGS) $(PKG) -+ $Q $(GOOS_OVERRIDE) $(_GOFLAGS) go build -v -o $(PREFIX)bin/$(BINNAME) $(LDFLAGS) $(PKG) - - $(PREFIX)bin/$(CLOUDKMS_BINNAME): download $(call rwildcard,*.go) - $Q mkdir -p $(@D) -- $Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o $(PREFIX)bin/$(CLOUDKMS_BINNAME) $(LDFLAGS) $(CLOUDKMS_PKG) -+ $Q $(GOOS_OVERRIDE) $(_GOFLAGS) go build -v -o $(PREFIX)bin/$(CLOUDKMS_BINNAME) $(LDFLAGS) $(CLOUDKMS_PKG) - - $(PREFIX)bin/$(AWSKMS_BINNAME): download $(call rwildcard,*.go) - $Q mkdir -p $(@D) -- $Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o $(PREFIX)bin/$(AWSKMS_BINNAME) $(LDFLAGS) $(AWSKMS_PKG) -+ $Q $(GOOS_OVERRIDE) $(_GOFLAGS) go build -v -o $(PREFIX)bin/$(AWSKMS_BINNAME) $(LDFLAGS) $(AWSKMS_PKG) - - $(PREFIX)bin/$(YUBIKEY_BINNAME): download $(call rwildcard,*.go) - $Q mkdir -p $(@D) -- $Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o $(PREFIX)bin/$(YUBIKEY_BINNAME) $(LDFLAGS) $(YUBIKEY_PKG) -+ $Q $(GOOS_OVERRIDE) $(_GOFLAGS) go build -v -o $(PREFIX)bin/$(YUBIKEY_BINNAME) $(LDFLAGS) $(YUBIKEY_PKG) - - $(PREFIX)bin/$(PKCS11_BINNAME): download $(call rwildcard,*.go) - $Q mkdir -p $(@D) -- $Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o $(PREFIX)bin/$(PKCS11_BINNAME) $(LDFLAGS) $(PKCS11_PKG) -+ $Q $(GOOS_OVERRIDE) $(_GOFLAGS) go build -v -o $(PREFIX)bin/$(PKCS11_BINNAME) $(LDFLAGS) $(PKCS11_PKG) - - # Target to force a build of step-ca without running tests - simple: build -@@ -132,7 +132,7 @@ - # Test - ######################################### - test: -- $Q $(GOFLAGS) go test -short -coverprofile=coverage.out ./... -+ $Q $(_GOFLAGS) go test -short -coverprofile=coverage.out ./... - - testcgo: - $Q go test -short -coverprofile=coverage.out ./... -@@ -142,7 +142,7 @@ - integrate: integration - - integration: bin/$(BINNAME) -- $Q $(GOFLAGS) go test -tags=integration ./integration/... -+ $Q $(_GOFLAGS) go test -tags=integration ./integration/... - - .PHONY: integrate integration - -@@ -154,7 +154,7 @@ - $Q gofmt -l -w $(SRC) - - lint: -- $Q $(GOFLAGS) LOG_LEVEL=error golangci-lint run --timeout=30m -+ $Q $(_GOFLAGS) LOG_LEVEL=error golangci-lint run --timeout=30m - - lintcgo: - $Q LOG_LEVEL=error golangci-lint run --timeout=30m |