From bd6d62dd31579a39588c79ef53e28e430888cd90 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sat, 30 May 2020 20:13:34 +0200
Subject: [PATCH 01/13] Increase maximum SQLite variables count to 32767

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 1afdcf7d3f415..9f3398df24b5d 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,7 @@ else
 endif
 
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
+export CGO_CFLAGS="-DSQLITE_MAX_VARIABLE_NUMBER=32767"
 
 GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/)))
 

From dc91a1ff35df7cdf790a056104f5ad93ff7dba45 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sat, 30 May 2020 20:14:32 +0200
Subject: [PATCH 02/13] Remove maxIssueIDs

---
 models/issue.go | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/models/issue.go b/models/issue.go
index 82f6c926ee773..1a4de26b3a5d9 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -76,7 +76,6 @@ var (
 const issueTasksRegexpStr = `(^\s*[-*]\s\[[\sxX]\]\s.)|(\n\s*[-*]\s\[[\sxX]\]\s.)`
 const issueTasksDoneRegexpStr = `(^\s*[-*]\s\[[xX]\]\s.)|(\n\s*[-*]\s\[[xX]\]\s.)`
 const issueMaxDupIndexAttempts = 3
-const maxIssueIDs = 950
 
 func init() {
 	issueTasksPat = regexp.MustCompile(issueTasksRegexpStr)
@@ -1114,9 +1113,6 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) {
 	}
 
 	if len(opts.IssueIDs) > 0 {
-		if len(opts.IssueIDs) > maxIssueIDs {
-			opts.IssueIDs = opts.IssueIDs[:maxIssueIDs]
-		}
 		sess.In("issue.id", opts.IssueIDs)
 	}
 
@@ -1360,9 +1356,6 @@ func getIssueStatsChunk(opts *IssueStatsOptions, issueIDs []int64) (*IssueStats,
 			Where("issue.repo_id = ?", opts.RepoID)
 
 		if len(opts.IssueIDs) > 0 {
-			if len(opts.IssueIDs) > maxIssueIDs {
-				opts.IssueIDs = opts.IssueIDs[:maxIssueIDs]
-			}
 			sess.In("issue.id", opts.IssueIDs)
 		}
 
@@ -1446,9 +1439,6 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
 		cond = cond.And(builder.In("issue.repo_id", opts.RepoIDs))
 	}
 	if len(opts.IssueIDs) > 0 {
-		if len(opts.IssueIDs) > maxIssueIDs {
-			opts.IssueIDs = opts.IssueIDs[:maxIssueIDs]
-		}
 		cond = cond.And(builder.In("issue.id", opts.IssueIDs))
 	}
 

From f99c0394c093bbba5c724dd6bb32f22e563484a8 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sat, 30 May 2020 20:20:38 +0200
Subject: [PATCH 03/13] Change to 32766 as per
 https://www.sqlite.org/limits.html

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9f3398df24b5d..a88e48d65da58 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ else
 endif
 
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
-export CGO_CFLAGS="-DSQLITE_MAX_VARIABLE_NUMBER=32767"
+export CGO_CFLAGS="-DSQLITE_MAX_VARIABLE_NUMBER=32766"
 
 GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/)))
 

From 80f128d8f7cc1ea58fba99366b4c1ba87711dffa Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sat, 30 May 2020 20:49:59 +0200
Subject: [PATCH 04/13] hello? golangci-lint?

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a88e48d65da58..4ca42643975fd 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ else
 endif
 
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
-export CGO_CFLAGS="-DSQLITE_MAX_VARIABLE_NUMBER=32766"
+export CGO_CFLAGS = -DSQLITE_MAX_VARIABLE_NUMBER=32766
 
 GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/)))
 
@@ -650,6 +650,7 @@ pr\#%: clean-all
 	$(GO) run contrib/pr/checkout.go $*
 
 .PHONY: golangci-lint
+unexport CGO_CFLAGS
 golangci-lint:
 	@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		export BINARY="golangci-lint"; \

From 6e527837ee6443f4eb65f5da4430e1c59c308490 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sat, 30 May 2020 21:00:06 +0200
Subject: [PATCH 05/13] missed docker makefile

---
 docker/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Makefile b/docker/Makefile
index 7824847e5415d..58ab8661f0f74 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -11,4 +11,4 @@ docker:
 
 .PHONY: docker-build
 docker-build:
-	docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" webhippie/golang:edge make clean build
+	docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" webhippie/golang:edge make clean build

From 0924f3cb09449df71639da4d2ffc0d5f01e41d93 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sat, 30 May 2020 21:13:35 +0200
Subject: [PATCH 06/13] ugh need to adjust Dockerfile too

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 8093853605efe..95a9bcd0393d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ ENV GOPROXY ${GOPROXY:-direct}
 ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS "bindata $TAGS"
+ENV CGO_CFLAGS "-DSQLITE_MAX_VARIABLE_NUMBER=32766"
 
 #Build deps
 RUN apk --no-cache add build-base git nodejs npm

From 157816df74bf890299885fb33ea8d255cbf893c4 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Tue, 2 Jun 2020 18:17:26 +0200
Subject: [PATCH 07/13] different approach

---
 Dockerfile |  3 ++-
 Makefile   | 13 ++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 95a9bcd0393d9..fc1fd3626c192 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@ ENV GOPROXY ${GOPROXY:-direct}
 ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS "bindata $TAGS"
-ENV CGO_CFLAGS "-DSQLITE_MAX_VARIABLE_NUMBER=32766"
+ARG CGO_CFLAGS=""
+ENV CGO_CFLAGS "-DSQLITE_MAX_VARIABLE_NUMBER=32766 $CGO_CFLAGS"
 
 #Build deps
 RUN apk --no-cache add build-base git nodejs npm
diff --git a/Makefile b/Makefile
index 4ca42643975fd..bd0026023d2c5 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ else
 endif
 
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
-export CGO_CFLAGS = -DSQLITE_MAX_VARIABLE_NUMBER=32766
+CGO_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766 $(CGO_CFLAGS)
 
 GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/)))
 
@@ -500,7 +500,7 @@ check: test
 
 .PHONY: install $(TAGS_PREREQ)
 install: $(wildcard *.go)
-	$(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)'
+	CGO_CFLAGS=$(CGO_CFLAGS) $(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)'
 
 .PHONY: build
 build: frontend backend
@@ -516,7 +516,7 @@ generate: $(TAGS_PREREQ)
 	CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
 
 $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
-	$(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
+	CGO_CFLAGS=$(CGO_CFLAGS) $(GO) build -mod=vendor $(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 release-sources release-check
@@ -529,7 +529,7 @@ release-windows: | $(DIST_DIRS)
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) get -u src.techknowlogick.com/xgo; \
 	fi
-	GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
+	CGO_CFLAGS=$(CGO_CFLAGS) GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	cp /build/* $(DIST)/binaries
 endif
@@ -539,7 +539,7 @@ release-linux: | $(DIST_DIRS)
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) get -u src.techknowlogick.com/xgo; \
 	fi
-	GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/mips64le,linux/mips,linux/mipsle' -out gitea-$(VERSION) .
+	CGO_CFLAGS=$(CGO_CFLAGS) GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/mips64le,linux/mips,linux/mipsle' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	cp /build/* $(DIST)/binaries
 endif
@@ -549,7 +549,7 @@ release-darwin: | $(DIST_DIRS)
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) get -u src.techknowlogick.com/xgo; \
 	fi
-	GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) .
+	CGO_CFLAGS=$(CGO_CFLAGS) GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	cp /build/* $(DIST)/binaries
 endif
@@ -650,7 +650,6 @@ pr\#%: clean-all
 	$(GO) run contrib/pr/checkout.go $*
 
 .PHONY: golangci-lint
-unexport CGO_CFLAGS
 golangci-lint:
 	@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		export BINARY="golangci-lint"; \

From 5e7edbae77a470bfd15925ff0261513c66c19313 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Tue, 2 Jun 2020 18:40:04 +0200
Subject: [PATCH 08/13] restore default -g -O2

---
 Dockerfile | 2 +-
 Makefile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fc1fd3626c192..944f3127551d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS "bindata $TAGS"
 ARG CGO_CFLAGS=""
-ENV CGO_CFLAGS "-DSQLITE_MAX_VARIABLE_NUMBER=32766 $CGO_CFLAGS"
+ENV CGO_CFLAGS "-DSQLITE_MAX_VARIABLE_NUMBER=32766 -g -O2 $CGO_CFLAGS"
 
 #Build deps
 RUN apk --no-cache add build-base git nodejs npm
diff --git a/Makefile b/Makefile
index bd0026023d2c5..362699afdce42 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ else
 endif
 
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
-CGO_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766 $(CGO_CFLAGS)
+CGO_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766 -g -O2 $(CGO_CFLAGS)
 
 GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/)))
 

From 9c5cd1c275f6dbb9abced6d7b26714feb2b1a728 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Wed, 3 Jun 2020 02:41:11 +0200
Subject: [PATCH 09/13] Apply suggestions per @silverwind

---
 Dockerfile | 8 ++++----
 Makefile   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 944f3127551d9..d4c721bacfe9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,7 @@ ENV GOPROXY ${GOPROXY:-direct}
 ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS "bindata $TAGS"
-ARG CGO_CFLAGS=""
-ENV CGO_CFLAGS "-DSQLITE_MAX_VARIABLE_NUMBER=32766 -g -O2 $CGO_CFLAGS"
+ARG CGO_EXTRA_CFLAGS=""
 
 #Build deps
 RUN apk --no-cache add build-base git nodejs npm
@@ -20,8 +19,9 @@ COPY . ${GOPATH}/src/code.gitea.io/gitea
 WORKDIR ${GOPATH}/src/code.gitea.io/gitea
 
 #Checkout version if set
-RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
- && make clean-all build
+RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi && \
+ export CGO_CFLAGS="$(go env CGO_CFLAGS) -DSQLITE_MAX_VARIABLE_NUMBER=32766 $CGO_EXTRA_CFLAGS" && \
+ make clean-all build
 
 FROM alpine:3.11
 LABEL maintainer="maintainers@gitea.io"
diff --git a/Makefile b/Makefile
index 362699afdce42..6511c15e14f33 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ else
 endif
 
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
-CGO_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766 -g -O2 $(CGO_CFLAGS)
+CGO_CFLAGS ?= $(shell $(GO) env CGO_CFLAGS) -DSQLITE_MAX_VARIABLE_NUMBER=32766
 
 GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/)))
 

From 89c8b9d8ae63280e92d87fef6dde2f07e892cdac Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Wed, 3 Jun 2020 03:09:27 +0200
Subject: [PATCH 10/13] fix quote

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6511c15e14f33..4ecb0929bcb83 100644
--- a/Makefile
+++ b/Makefile
@@ -500,7 +500,7 @@ check: test
 
 .PHONY: install $(TAGS_PREREQ)
 install: $(wildcard *.go)
-	CGO_CFLAGS=$(CGO_CFLAGS) $(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)'
+	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)'
 
 .PHONY: build
 build: frontend backend
@@ -516,7 +516,7 @@ generate: $(TAGS_PREREQ)
 	CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
 
 $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
-	CGO_CFLAGS=$(CGO_CFLAGS) $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
+	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build -mod=vendor $(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 release-sources release-check
@@ -529,7 +529,7 @@ release-windows: | $(DIST_DIRS)
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) get -u src.techknowlogick.com/xgo; \
 	fi
-	CGO_CFLAGS=$(CGO_CFLAGS) GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
+	CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	cp /build/* $(DIST)/binaries
 endif
@@ -539,7 +539,7 @@ release-linux: | $(DIST_DIRS)
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) get -u src.techknowlogick.com/xgo; \
 	fi
-	CGO_CFLAGS=$(CGO_CFLAGS) GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/mips64le,linux/mips,linux/mipsle' -out gitea-$(VERSION) .
+	CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/mips64le,linux/mips,linux/mipsle' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	cp /build/* $(DIST)/binaries
 endif
@@ -549,7 +549,7 @@ release-darwin: | $(DIST_DIRS)
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) get -u src.techknowlogick.com/xgo; \
 	fi
-	CGO_CFLAGS=$(CGO_CFLAGS) GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) .
+	CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) .
 ifeq ($(CI),drone)
 	cp /build/* $(DIST)/binaries
 endif

From d0357c830716479176988f94bad54ebbc39dc5cb Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Wed, 3 Jun 2020 13:48:30 +0200
Subject: [PATCH 11/13] move to inside HAS_GO

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4ecb0929bcb83..012266418e22b 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,9 @@ MIN_NODE_VERSION := 010013000
 ifeq ($(HAS_GO), GO)
 	GOPATH ?= $(shell $(GO) env GOPATH)
 	export PATH := $(GOPATH)/bin:$(PATH)
+
+	CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766
+	CGO_CFLAGS ?= $(shell $(GO) env CGO_CFLAGS) $(CGO_EXTRA_CFLAGS)
 endif
 
 
@@ -82,7 +85,6 @@ else
 endif
 
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
-CGO_CFLAGS ?= $(shell $(GO) env CGO_CFLAGS) -DSQLITE_MAX_VARIABLE_NUMBER=32766
 
 GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/)))
 

From fa4501befc33b1ed1917618b9f4fe1fed6e689ad Mon Sep 17 00:00:00 2001
From: Matti R <matti@mdranta.net>
Date: Fri, 5 Jun 2020 19:04:02 -0400
Subject: [PATCH 12/13] revert changes to docker

---
 Dockerfile      | 4 +---
 docker/Makefile | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 01aedeefc9d02..5fdb599d47f23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,6 @@ ENV GOPROXY ${GOPROXY:-direct}
 ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS "bindata $TAGS"
-ARG CGO_EXTRA_CFLAGS=""
 
 #Build deps
 RUN apk --no-cache add build-base git nodejs npm
@@ -20,8 +19,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
 
 #Checkout version if set
 RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi && \
- export CGO_CFLAGS="$(go env CGO_CFLAGS) -DSQLITE_MAX_VARIABLE_NUMBER=32766 $CGO_EXTRA_CFLAGS" && \
- make clean-all build
+ && make clean-all build
 
 FROM alpine:3.12
 LABEL maintainer="maintainers@gitea.io"
diff --git a/docker/Makefile b/docker/Makefile
index 58ab8661f0f74..7824847e5415d 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -11,4 +11,4 @@ docker:
 
 .PHONY: docker-build
 docker-build:
-	docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" webhippie/golang:edge make clean build
+	docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" webhippie/golang:edge make clean build

From ae17e4425f7cd9e463faebfb3f8e74cab4e50f69 Mon Sep 17 00:00:00 2001
From: techknowlogick <matti@mdranta.net>
Date: Fri, 5 Jun 2020 19:04:57 -0400
Subject: [PATCH 13/13] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5fdb599d47f23..d029efed49c66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ COPY . ${GOPATH}/src/code.gitea.io/gitea
 WORKDIR ${GOPATH}/src/code.gitea.io/gitea
 
 #Checkout version if set
-RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi && \
+RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
  && make clean-all build
 
 FROM alpine:3.12