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 0d59710144782cb6230a0ca8cd1242cee949cfc2..a17eeeb01249d5d1e3b3c6bc05c639d2523d126d 100644 (file)
--- 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 6b1e8042049f3aa913e2f14b5031f674b4bb63e9..3a6e1c9faaa85870ed9fbff58ae5758829250be8 100644 (file)
--- 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 842f2de6180b15d0e7f810515633bf1bf545a62a..28d42bd3c1c6cd4c0b877d6b6825a598b37a6a32 100644 (file)
--- 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 a43ceccda4ce3bdda19df3bcb40df103648038f6..2ca79c7c717de59bdcf6a5e8f2c042f39fcf25da 100644 (file)
--- 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 6bc97f582c5244349ed8a8da50241460119d1e1b..7487beb7d1f9acd2fda4003bf4e85baf10dce4a9 100644 (file)
--- 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 6e990e2f8ac819e1a88bd5e1449a76e25f041b86..f50d0eaa2e1b0c36334849351be38c28e01b3f0d 100644 (file)
--- 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