[Pkg-golang-commits] [golang] 01/03: Add 0001-Fix-FTBFS-with-Perl-526.patch

[Michael Stapelberg]

This is an automated email from the git hooks/post-receive script.

stapelberg pushed a commit to branch golang-1.8
in repository golang.

commit 2722dc4b6632c52c057ca75fd736880242c5ca71
Author: Michael Stapelberg <stapelberg at debian.org>
Date:   Mon Jul 24 09:49:50 2017 +0200

    Add 0001-Fix-FTBFS-with-Perl-526.patch
---
 debian/patches/0001-Fix-FTBFS-with-Perl-526.patch | 32 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/0001-Fix-FTBFS-with-Perl-526.patch b/debian/patches/0001-Fix-FTBFS-with-Perl-526.patch
new file mode 100644
index 0000000..b638539
--- /dev/null
+++ b/debian/patches/0001-Fix-FTBFS-with-Perl-526.patch
@@ -0,0 +1,32 @@
+Description: cmd/vet: make tests safe for perl 5.26
+Author: Josh Bleecher Snyder <josharian at gmail.com>
+Applied-Upstream: https://github.com/golang/go/commit/2e45310caff101ea7de8873523faab96eb3a87ca
+Last-Updated: 2017-07-24
+
+---
+
+Index: golang/src/cmd/vet/testdata/copylock_func.go
+===================================================================
+--- golang.orig/src/cmd/vet/testdata/copylock_func.go
++++ golang/src/cmd/vet/testdata/copylock_func.go
+@@ -87,9 +87,9 @@ func FuncCallInterfaceArg(f func(a int,
+ 	f(2, &t)
+ 	f(3, &sync.Mutex{})
+ 	f(4, m) // ERROR "call of f copies lock value: sync.Mutex"
+-	f(5, t) // ERROR "call of f copies lock value: struct{lock sync.Mutex} contains sync.Mutex"
++	f(5, t) // ERROR "call of f copies lock value: struct.lock sync.Mutex. contains sync.Mutex"
+ 	var fntab []func(t)
+-	fntab[0](t) // ERROR "call of fntab.0. copies lock value: struct{lock sync.Mutex} contains sync.Mutex"
++	fntab[0](t) // ERROR "call of fntab.0. copies lock value: struct.lock sync.Mutex. contains sync.Mutex"
+ }
+ 
+ // Returning lock via interface value
+@@ -105,7 +105,7 @@ func ReturnViaInterface(x int) (int, int
+ 	case 2:
+ 		return 2, m // ERROR "return copies lock value: sync.Mutex"
+ 	default:
+-		return 3, t // ERROR "return copies lock value: struct{lock sync.Mutex} contains sync.Mutex"
++		return 3, t // ERROR "return copies lock value: struct.lock sync.Mutex. contains sync.Mutex"
+ 	}
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c9dd75a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-FTBFS-with-Perl-526.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git