[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/files/, dev-lang/go/

["William Hubbs" <williamh@gentoo.org>]

commit:     39807b1e2e146b4599f68d07a9fd41bad7f62404
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 17:22:40 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed May 18 17:23:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39807b1e

dev-lang/go: apply patch for #581072

Gdb was starting by spawning a shell and this was causing issues for the tests.

Package-Manager: portage-2.2.28

 dev-lang/go/files/go-1.6.1-gdb-no-shell.patch | 12 ++++++++++++
 dev-lang/go/files/go-1.6.2-gdb-no-shell.patch | 12 ++++++++++++
 dev-lang/go/go-1.6.1.ebuild                   |  5 +++++
 dev-lang/go/go-1.6.2.ebuild                   |  5 +++++
 4 files changed, 34 insertions(+)

diff --git a/dev-lang/go/files/go-1.6.1-gdb-no-shell.patch b/dev-lang/go/files/go-1.6.1-gdb-no-shell.patch
new file mode 100644
index 0000000..ccce6f0
--- /dev/null
+++ b/dev-lang/go/files/go-1.6.1-gdb-no-shell.patch
@@ -0,0 +1,12 @@
+diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go
+index 6ebc69a..648092a 100644
+--- a/src/runtime/runtime-gdb_test.go
++++ b/src/runtime/runtime-gdb_test.go
+@@ -87,6 +87,7 @@ func TestGdbPython(t *testing.T) {
+ 
+ 	args := []string{"-nx", "-q", "--batch", "-iex",
+ 		fmt.Sprintf("add-auto-load-safe-path %s/src/runtime", runtime.GOROOT()),
++		"-ex", "set startup-with-shell off",
+ 		"-ex", "info auto-load python-scripts",
+ 		"-ex", "br main.go:10",
+ 		"-ex", "run",

diff --git a/dev-lang/go/files/go-1.6.2-gdb-no-shell.patch b/dev-lang/go/files/go-1.6.2-gdb-no-shell.patch
new file mode 100644
index 0000000..ccce6f0
--- /dev/null
+++ b/dev-lang/go/files/go-1.6.2-gdb-no-shell.patch
@@ -0,0 +1,12 @@
+diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go
+index 6ebc69a..648092a 100644
+--- a/src/runtime/runtime-gdb_test.go
++++ b/src/runtime/runtime-gdb_test.go
+@@ -87,6 +87,7 @@ func TestGdbPython(t *testing.T) {
+ 
+ 	args := []string{"-nx", "-q", "--batch", "-iex",
+ 		fmt.Sprintf("add-auto-load-safe-path %s/src/runtime", runtime.GOROOT()),
++		"-ex", "set startup-with-shell off",
+ 		"-ex", "info auto-load python-scripts",
+ 		"-ex", "br main.go:10",
+ 		"-ex", "run",

diff --git a/dev-lang/go/go-1.6.1.ebuild b/dev-lang/go/go-1.6.1.ebuild
index c70fc26..4fce12b 100644
--- a/dev-lang/go/go-1.6.1.ebuild
+++ b/dev-lang/go/go-1.6.1.ebuild
@@ -80,6 +80,11 @@ if [[ ${PV} != 9999 ]]; then
 	S="${WORKDIR}"/go
 fi
 
+PATCHES=(
+# patch for #581072
+	"${FILESDIR}"/${P}-gdb-no-shell.patch
+)
+
 go_arch()
 {
 	# By chance most portage arch names match Go

diff --git a/dev-lang/go/go-1.6.2.ebuild b/dev-lang/go/go-1.6.2.ebuild
index 9a52b39..ddf85db 100644
--- a/dev-lang/go/go-1.6.2.ebuild
+++ b/dev-lang/go/go-1.6.2.ebuild
@@ -81,6 +81,11 @@ if [[ ${PV} != 9999 ]]; then
 	S="${WORKDIR}"/go
 fi
 
+PATCHES=(
+# patch for #581072
+	"${FILESDIR}"/${P}-gdb-no-shell.patch
+)
+
 go_arch()
 {
 	# By chance most portage arch names match Go