From 41f08005b64f9dc76b5ab059cf7ed882e42089c9 Mon Sep 17 00:00:00 2001 From: "Laszlo Boszormenyi (GCS)" Date: Fri, 24 Sep 2021 16:18:04 +0100 Subject: [PATCH] golang dependencies already installed as build dependency Forwarded: no Last-Update: 2019-12-01 Gbp-Pq: Name golang_dependency_installed.patch --- lib/go/test/Makefile.am | 6 +++--- test/go/Makefile.am | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 -- 2.30.2