From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Date: Sun, 22 Nov 2020 14:00:47 +0000 (+0000)
Subject: golang dependencies already installed as build dependency
X-Git-Tag: archive/raspbian/0.13.0-6+rpi1~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=08d0979fce05e05f18197e1be152b91a9f7244b8;p=thrift.git

golang dependencies already installed as build dependency

Forwarded: no
Last-Update: 2019-12-01


Gbp-Pq: Name golang_dependency_installed.patch
---

diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index 244ddff..9809215 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -71,9 +71,9 @@ gopath: $(THRIFT) $(THRIFTTEST) \
 	$(THRIFT) $(THRIFTARGS) ConflictNamespaceTestD.thrift
 	$(THRIFT) $(THRIFTARGS) ConflictNamespaceTestSuperThing.thrift
 	$(THRIFT) $(THRIFTARGS) ConflictNamespaceServiceTest.thrift
-	GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock || true
-	sed -i 's/\"context\"/\"golang.org\/x\/net\/context\"/g' gopath/src/github.com/golang/mock/gomock/controller.go || true
-	GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock
+	echo GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock || true
+	echo sed -i 's/\"context\"/\"golang.org\/x\/net\/context\"/g' gopath/src/github.com/golang/mock/gomock/controller.go || true
+	echo GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock
 	ln -nfs ../../../thrift gopath/src/thrift
 	ln -nfs ../../tests gopath/src/tests
 	cp -r ./dontexportrwtest gopath/src
diff --git a/test/go/Makefile.am b/test/go/Makefile.am
index 3cf6a70..c1f0089 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -34,9 +34,9 @@ gopath: $(THRIFT) ThriftTest.thrift
 	mkdir -p src/gen
 	$(THRIFTCMD) ThriftTest.thrift
 	$(THRIFTCMD) ../StressTest.thrift
-	GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock || true
-	sed -i 's/\"context\"/\"golang.org\/x\/net\/context\"/g' src/github.com/golang/mock/gomock/controller.go || true
-	GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock
+	echo GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock || true
+	echo sed -i 's/\"context\"/\"golang.org\/x\/net\/context\"/g' src/github.com/golang/mock/gomock/controller.go || true
+	echo GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock
 	ln -nfs ../../../lib/go/thrift src/thrift
 	touch gopath