From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Date: Tue, 8 Jan 2019 21:31:07 +0000 (+0000)
Subject: golang dependencies already installed as build dependency
X-Git-Tag: archive/raspbian/0.13.0-6+rpi1~1^2^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=987d0bbaa51d9c3c5c87f5c478c7ccf444e2bfc7;p=thrift.git

golang dependencies already installed as build dependency

Forwarded: no
Last-Update: 2018-09-20


Gbp-Pq: Name golang_dependency_installed.patch
---

diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am
index 0d59710..a17eeeb 100644
--- a/lib/go/Makefile.am
+++ b/lib/go/Makefile.am
@@ -31,14 +31,14 @@ install:
 	@echo '##############################################################'
 
 check-local:
-	GOPATH=`pwd` $(GO) get golang.org/x/net/context
+#	GOPATH=`pwd` $(GO) get golang.org/x/net/context
 	GOPATH=`pwd` $(GO) test -race ./thrift
 
 clean-local:
 	$(RM) -rf pkg
 
 all-local:
-	GOPATH=`pwd` $(GO) get golang.org/x/net/context
+#	GOPATH=`pwd` $(GO) get golang.org/x/net/context
 	GOPATH=`pwd` $(GO) build ./thrift
 
 EXTRA_DIST = \
diff --git a/lib/go/Makefile.in b/lib/go/Makefile.in
index 6b1e804..3a6e1c9 100644
--- a/lib/go/Makefile.in
+++ b/lib/go/Makefile.in
@@ -813,14 +813,14 @@ install:
 	@echo '##############################################################'
 
 check-local:
-	GOPATH=`pwd` $(GO) get golang.org/x/net/context
+#	GOPATH=`pwd` $(GO) get golang.org/x/net/context
 	GOPATH=`pwd` $(GO) test -race ./thrift
 
 clean-local:
 	$(RM) -rf pkg
 
 all-local:
-	GOPATH=`pwd` $(GO) get golang.org/x/net/context
+#	GOPATH=`pwd` $(GO) get golang.org/x/net/context
 	GOPATH=`pwd` $(GO) build ./thrift
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index 842f2de..28d42bd 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -59,10 +59,10 @@ gopath: $(THRIFT) $(THRIFTTEST) \
 	$(THRIFT) $(THRIFTARGS) InitialismsTest.thrift
 	$(THRIFT) $(THRIFTARGS),read_write_private DontExportRWTest.thrift
 	$(THRIFT) $(THRIFTARGS),ignore_initialisms IgnoreInitialismsTest.thrift
-	GOPATH=`pwd`/gopath $(GO) get golang.org/x/net/context
-	GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock || true
+#	GOPATH=`pwd`/gopath $(GO) get golang.org/x/net/context
+#	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
+#	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/lib/go/test/Makefile.in b/lib/go/test/Makefile.in
index a43cecc..2ca79c7 100644
--- a/lib/go/test/Makefile.in
+++ b/lib/go/test/Makefile.in
@@ -675,10 +675,10 @@ gopath: $(THRIFT) $(THRIFTTEST) \
 	$(THRIFT) $(THRIFTARGS) InitialismsTest.thrift
 	$(THRIFT) $(THRIFTARGS),read_write_private DontExportRWTest.thrift
 	$(THRIFT) $(THRIFTARGS),ignore_initialisms IgnoreInitialismsTest.thrift
-	GOPATH=`pwd`/gopath $(GO) get golang.org/x/net/context
-	GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock || true
+#	GOPATH=`pwd`/gopath $(GO) get golang.org/x/net/context
+#	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
+#	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 6bc97f5..7487beb 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -37,10 +37,10 @@ gopath: $(THRIFT) ThriftTest.thrift
 	mkdir -p src/gen
 	$(THRIFTCMD) ThriftTest.thrift
 	$(THRIFTCMD) ../StressTest.thrift
-	GOPATH=`pwd` $(GO) get golang.org/x/net/context
-	GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock || true
+#	GOPATH=`pwd` $(GO) get golang.org/x/net/context
+#	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
+#	GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock
 	ln -nfs ../../../lib/go/thrift src/thrift
 	touch gopath
 
diff --git a/test/go/Makefile.in b/test/go/Makefile.in
index 6e990e2..f50d0ea 100644
--- a/test/go/Makefile.in
+++ b/test/go/Makefile.in
@@ -641,10 +641,10 @@ gopath: $(THRIFT) ThriftTest.thrift
 	mkdir -p src/gen
 	$(THRIFTCMD) ThriftTest.thrift
 	$(THRIFTCMD) ../StressTest.thrift
-	GOPATH=`pwd` $(GO) get golang.org/x/net/context
-	GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock || true
+#	GOPATH=`pwd` $(GO) get golang.org/x/net/context
+#	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
+#	GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock
 	ln -nfs ../../../lib/go/thrift src/thrift
 	touch gopath