From e0c49cbaf39a7a6f70c78b92f56df8086e577431 Mon Sep 17 00:00:00 2001
From: "Laszlo Boszormenyi (GCS)" <gcs@debian.org>
Date: Wed, 28 Sep 2022 18:05:02 +0100
Subject: [PATCH] Go mod can't be specified

Forwarded: no
Last-Update: 2022-09-22

Just delete those from Go invocation.

Gbp-Pq: Name go_no_mod.patch
---
 lib/go/Makefile.am           | 6 +++---
 lib/go/test/Makefile.am      | 8 ++++----
 lib/go/test/fuzz/Makefile.am | 6 +++---
 test/go/Makefile.am          | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am
index 788a053..c13f2ed 100644
--- a/lib/go/Makefile.am
+++ b/lib/go/Makefile.am
@@ -39,14 +39,14 @@ install:
 # NOTE: We have to disable stdmethods in go vet until
 # https://github.com/golang/go/issues/52445 is fixed.
 check-local:
-	$(GO) vet -mod=mod -stdmethods=false github.com/apache/thrift/lib/go/thrift
-	$(GO) test -mod=mod ./thrift
+	$(GO) vet -stdmethods=false github.com/apache/thrift/lib/go/thrift
+	$(GO) test ./thrift
 
 clean-local:
 	$(RM) -rf pkg
 
 all-local:
-	$(GO) build $(GOBUILDEXTRA) -mod=mod ./thrift
+	$(GO) build $(GOBUILDEXTRA) ./thrift
 
 EXTRA_DIST = \
 	thrift \
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index d938449..ae6bb5a 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -103,7 +103,7 @@ gopath: $(THRIFT) $(THRIFTTEST) \
 	touch gopath
 
 check: gopath
-	$(GO) build $(GOBUILDEXTRA) -mod=mod \
+	$(GO) build $(GOBUILDEXTRA) \
 				./gopath/src/includestest \
 				./gopath/src/binarykeytest \
 				./gopath/src/servicestest \
@@ -123,14 +123,14 @@ check: gopath
 				./gopath/src/conflictargnamestest \
 				./gopath/src/processormiddlewaretest \
 				./gopath/src/clientmiddlewareexceptiontest
-	$(GO) test -mod=mod github.com/apache/thrift/lib/go/thrift
-	$(GO) test -mod=mod ./gopath/src/tests ./gopath/src/dontexportrwtest
+	$(GO) test github.com/apache/thrift/lib/go/thrift
+	$(GO) test ./gopath/src/tests ./gopath/src/dontexportrwtest
 
 clean-local:
 	$(RM) -r gopath ThriftTest.thrift gen-go
 
 client: stubs
-	$(GO) run -mod=mod TestClient.go
+	$(GO) run TestClient.go
 
 EXTRA_DIST = \
 	dontexportrwtest \
diff --git a/lib/go/test/fuzz/Makefile.am b/lib/go/test/fuzz/Makefile.am
index a8a8102..89c299d 100644
--- a/lib/go/test/fuzz/Makefile.am
+++ b/lib/go/test/fuzz/Makefile.am
@@ -19,12 +19,12 @@
 
 gopathfuzz: $(THRIFT) fuzz.go
 	$(THRIFT) -r --gen go:thrift_import=github.com/apache/thrift/lib/go/thrift$(COMPILER_EXTRAFLAG) ../../../../tutorial/tutorial.thrift
-	cd gen-go/shared && go mod init shared
-	cd gen-go/tutorial && go mod init tutorial
+#	cd gen-go/shared && go mod init shared
+#	cd gen-go/tutorial && go mod init tutorial
 	touch gopathfuzz
 
 check: gopathfuzz
-	go test -mod=mod -tags gofuzz
+	go test -tags gofuzz
 
 clean-local:
 	$(RM) -r gopathfuzz gen-go
diff --git a/test/go/Makefile.am b/test/go/Makefile.am
index ef00df3..663f194 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -43,13 +43,13 @@ gopath: $(THRIFT) ThriftTest.thrift
 	touch gopath
 
 bin/testclient: gopath
-	GOPATH=`pwd` $(GO) install $(GOINSTALLEXTRA) -mod=mod ./src/bin/testclient
+	GOPATH=`pwd` $(GO) install $(GOINSTALLEXTRA) ./src/bin/testclient
 
 bin/testserver: gopath
-	GOPATH=`pwd` $(GO) install $(GOINSTALLEXTRA) -mod=mod ./src/bin/testserver
+	GOPATH=`pwd` $(GO) install $(GOINSTALLEXTRA) ./src/bin/testserver
 
 bin/stress: gopath
-	GOPATH=`pwd` $(GO) install $(GOINSTALLEXTRA) -mod=mod ./src/bin/stress
+	GOPATH=`pwd` $(GO) install $(GOINSTALLEXTRA) ./src/bin/stress
 
 clean-local:
 	$(RM) -r src/gen src/github.com/golang src/thrift bin pkg gopath ThriftTest.thrift
@@ -57,7 +57,7 @@ clean-local:
 check_PROGRAMS: bin/testclient bin/testserver bin/stress
 
 check: gopath genmock
-	$(GO) test -mod=mod -v ./src/common/...
+	$(GO) test -v ./src/common/...
 
 genmock: gopath
 	sh genmock.sh
-- 
2.30.2