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 244ddff1fd6ce08b9e61e432ca3cb9f1aebffdae..98092158e82381490a152771cd497569dbabd869 100644 (file)
--- 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 3cf6a70ee59eb2360b6d1fb81ccdc02abd82dd3f..c1f008994a310fafb91d9b18308183fbceea979a 100644 (file)
--- 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