[Pkg-golang-commits] [golang] 01/01: Backport "ar" arguments change from go1.6 to quiet spurious warnings while using gccgo (Closes: #807138)

[Tianon Gravi]

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

tianon pushed a commit to branch debian-sid
in repository golang.

commit 60bd23fb0453320fc6dd90c9579b5c011ff9a491
Author: Tianon Gravi <tianon at debian.org>
Date:   Tue Feb 2 22:36:58 2016 -0800

    Backport "ar" arguments change from go1.6 to quiet spurious warnings while using gccgo (Closes: #807138)
---
 debian/changelog           |  4 ++++
 debian/patches/ar-rc.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c88a09d..90a959d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ golang (2:1.5.3-2) UNRELEASED; urgency=medium
   * Trim Build-Depends (Closes: #807299)
   * Fix several minor debian/copyright issues (Closes: #807304)
 
+  [ Tianon Gravi ]
+  * Backport "ar" arguments change from go1.6 to quiet spurious warnings while
+    using gccgo (Closes: #807138)
+
  -- Tianon Gravi <tianon at debian.org>  Tue, 02 Feb 2016 21:54:29 -0800
 
 golang (2:1.5.3-1) unstable; urgency=high
diff --git a/debian/patches/ar-rc.patch b/debian/patches/ar-rc.patch
new file mode 100644
index 0000000..b58cb05
--- /dev/null
+++ b/debian/patches/ar-rc.patch
@@ -0,0 +1,35 @@
+From 321cf6f86dd28248d98e5e24c073740f23c1897b Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant at golang.org>
+Date: Wed, 4 Nov 2015 17:38:53 -0800
+Subject: [PATCH] cmd/go: change ar argument to rc
+
+Put 'r' first because that is the command, and 'c' is the modifier.
+Keep 'c' because it means to not warn when creating an archive.
+Drop 'u' because it is unnecessary and fails on Arch Linux.
+
+No test because this is only for gccgo (I tested it manually).
+
+Fixes #12310.
+
+Change-Id: Id740257fb1c347dfaa60f7d613af2897dae2c059
+Reviewed-on: https://go-review.googlesource.com/16664
+Run-TryBot: Ian Lance Taylor <iant at golang.org>
+TryBot-Result: Gobot Gobot <gobot at golang.org>
+Reviewed-by: David Crawshaw <crawshaw at golang.org>
+---
+ src/cmd/go/build.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
+index 54d1b8f..e869b27 100644
+--- a/src/cmd/go/build.go
++++ b/src/cmd/go/build.go
+@@ -2506,7 +2506,7 @@ func (gccgoToolchain) pack(b *builder, p *Package, objDir, afile string, ofiles
+ 	for _, f := range ofiles {
+ 		absOfiles = append(absOfiles, mkAbs(objDir, f))
+ 	}
+-	return b.run(p.Dir, p.ImportPath, nil, "ar", "cru", mkAbs(objDir, afile), absOfiles)
++	return b.run(p.Dir, p.ImportPath, nil, "ar", "rc", mkAbs(objDir, afile), absOfiles)
+ }
+ 
+ func (tools gccgoToolchain) ld(b *builder, root *action, out string, allactions []*action, mainpkg string, ofiles []string) error {
diff --git a/debian/patches/series b/debian/patches/series
index 54ee857..71532d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 skip-userns-tests-when-chrooted.patch
+ar-rc.patch

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