From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Date: Tue, 13 Sep 2022 18:24:02 +0000 (+0100)
Subject: Go mod can't be specified
X-Git-Tag: archive/raspbian/0.16.0-7+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=55feaa39c9fa2023e9696a63c43d3f171d971d0d;p=thrift.git

Go mod can't be specified

Forwarded: no
Last-Update: 2022-04-01

Just delete those from Go invocation.

Gbp-Pq: Name go_no_mod.patch
---

diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am
index 06a5cae..e8f3a9c 100644
--- a/lib/go/Makefile.am
+++ b/lib/go/Makefile.am
@@ -31,13 +31,13 @@ install:
 	@echo '##############################################################'
 
 check-local:
-	$(GO) test -mod=mod ./thrift
+	$(GO) test ./thrift
 
 clean-local:
 	$(RM) -rf pkg
 
 all-local:
-	$(GO) build -mod=mod ./thrift
+	$(GO) build ./thrift
 
 EXTRA_DIST = \
 	thrift \
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index 4b3ecda..39d811b 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -89,7 +89,7 @@ gopath: $(THRIFT) $(THRIFTTEST) \
 	touch gopath
 
 check: gopath
-	$(GO) build -mod=mod \
+	$(GO) build \
 				./gopath/src/includestest \
 				./gopath/src/binarykeytest \
 				./gopath/src/servicestest \
@@ -107,14 +107,14 @@ check: gopath
 				./gopath/src/duplicateimportstest \
 				./gopath/src/equalstest \
 				./gopath/src/conflictargnamestest
-	$(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 391c84a..44bc6e2 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 d7db957..56d3923 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -37,13 +37,13 @@ gopath: $(THRIFT) ThriftTest.thrift
 	touch gopath
 
 bin/testclient: gopath
-	GOPATH=`pwd` $(GO) install -mod=mod ./src/bin/testclient
+	GOPATH=`pwd` $(GO) install ./src/bin/testclient
 
 bin/testserver: gopath
-	GOPATH=`pwd` $(GO) install -mod=mod ./src/bin/testserver
+	GOPATH=`pwd` $(GO) install ./src/bin/testserver
 
 bin/stress: gopath
-	GOPATH=`pwd` $(GO) install -mod=mod ./src/bin/stress
+	GOPATH=`pwd` $(GO) install ./src/bin/stress
 
 clean-local:
 	$(RM) -r src/gen src/github.com/golang src/thrift bin pkg gopath ThriftTest.thrift
@@ -51,7 +51,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