From 389496bc93791b974246dc10aeccd2332873d6ce Mon Sep 17 00:00:00 2001 From: Abdulrhmn Ghanem Date: Mon, 20 Jun 2022 15:02:49 +0200 Subject: [PATCH 1/2] Disable `buildvcs` - Fixes https://github.com/go-gitea/gitea/issues/20055 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2e2c86376b3b0..1558e193fb739 100644 --- a/Makefile +++ b/Makefile @@ -602,7 +602,7 @@ generate: $(TAGS_PREREQ) @CC= GOOS= GOARCH= $(GO) generate -tags '$(TAGS)' $(GO_PACKAGES) $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) - CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ + CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build -buildvcs=false $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ .PHONY: release release: frontend generate release-windows release-linux release-darwin release-copy release-compress vendor release-sources release-docs release-check From 607f0ef321438c6693e7f935f12cdea7561206cf Mon Sep 17 00:00:00 2001 From: Abdulrhmn Ghanem Date: Mon, 4 Jul 2022 21:27:11 +0200 Subject: [PATCH 2/2] Move `buildvcs` to `EXTRA_GOFLAGS` --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1558e193fb739..30d0d45de244c 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ else SED_INPLACE := sed -i '' endif -EXTRA_GOFLAGS ?= +EXTRA_GOFLAGS ?= -buildvcs=false MAKE_VERSION := $(shell "$(MAKE)" -v | head -n 1) MAKE_EVIDENCE_DIR := .make_evidence @@ -602,7 +602,7 @@ generate: $(TAGS_PREREQ) @CC= GOOS= GOARCH= $(GO) generate -tags '$(TAGS)' $(GO_PACKAGES) $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) - CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build -buildvcs=false $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ + CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ .PHONY: release release: frontend generate release-windows release-linux release-darwin release-copy release-compress vendor release-sources release-docs release-check