unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Alex Griffin" <a@ajgrf.com>
To: 35348@debbugs.gnu.org
Subject: [bug#35348] [PATCH] gnu: go@1.4: Update to 1.4-bootstrap-20171003.
Date: Sat, 20 Apr 2019 15:41:34 -0400	[thread overview]
Message-ID: <6d838647-e07c-4713-a5a4-c43ec57cf526@www.fastmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

The Go bootstrap compiler in Guix currently includes a couple unnecessary workarounds for bugs which have already been fixed. This patch switches to using the bootstrap branch which is still maintained upstream.

-- 
Alex Griffin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-go-1.4-Update-to-1.4-bootstrap-20171003.patch --]
[-- Type: text/x-patch; name="0001-gnu-go-1.4-Update-to-1.4-bootstrap-20171003.patch", Size: 3048 bytes --]

From 4d784a54e5736d2eaeac2a6e9ed14c7d11598705 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Sat, 20 Apr 2019 14:01:17 -0500
Subject: [PATCH] gnu: go@1.4: Update to 1.4-bootstrap-20171003.

* gnu/packages/golang.scm (go-1.4): Use the bootstrap branch that is
still support upstream.
[version]: Update to 1.4-bootstrap-20171003.
[arguments]: Remove fix to timezone test which is now included upstream. Don't
manually disable CGO because it is disabled by default. Manually enable test
suite because future releases will disable tests by default.
---
 gnu/packages/golang.scm | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0b44bd3d02..3bd1c3eb8f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright @ 2018, 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu>
+;;; Copyright @ 2019 Alex Griffin <a@ajgrf.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,14 +62,14 @@
 (define-public go-1.4
   (package
     (name "go")
-    (version "1.4.3")
+    (version "1.4-bootstrap-20171003")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://storage.googleapis.com/golang/"
-                                  name version ".src.tar.gz"))
+                                  name version ".tar.gz"))
               (sha256
                (base32
-                "0na9yqilzpvq0bjndbibfp07wr796gf252y471cip10bbdqgqiwr"))))
+                "0liybk5z00hizsb5ypkbhqcawnwwa6mkwgvjjg4y3jm3ndg5pzzl"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc"
@@ -135,13 +136,6 @@
                   ("os/os_test.go" "(.+)(TestHostname.+)")
                   ("time/format_test.go" "(.+)(TestParseInSydney.+)")
 
-                  ;; Tzdata 2016g changed the name of the time zone used in this
-                  ;; test, and the patch for Go 1.7 does not work for 1.4.3:
-                  ;; https://github.com/golang/go/issues/17545
-                  ;; https://github.com/golang/go/issues/17276
-                  ("time/time_test.go" "(.+)(TestLoadFixed.+)")
-                  ("time/format_test.go" "(.+)(TestParseInLocation.+)")
-
                   ("os/exec/exec_test.go" "(.+)(TestEcho.+)")
                   ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)")
                   ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)")
@@ -168,9 +162,7 @@
                (setenv "GOOS" "linux")
                (setenv "GOROOT" (dirname (getcwd)))
                (setenv "GOROOT_FINAL" output)
-               ;; Go 1.4's cgo will not work with binutils >= 2.27:
-               ;; https://github.com/golang/go/issues/16906
-               (setenv "CGO_ENABLED" "0")
+               (setenv "GO14TESTS" "1")
                (invoke "sh" "all.bash"))))
 
          (replace 'install
-- 
2.20.1


             reply	other threads:[~2019-04-20 19:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-20 19:41 Alex Griffin [this message]
2019-05-27 14:29 ` [bug#35348] [PATCH] gnu: go@1.4: Update to 1.4-bootstrap-20171003 Ludovic Courtès
2019-05-27 17:33 ` Leo Famulari
2019-05-27 17:38   ` Leo Famulari
2019-05-27 17:46     ` Alex Griffin
2019-05-27 18:27       ` bug#35348: " Leo Famulari
2019-05-29 16:52         ` [bug#35348] " Alex Griffin
2019-05-31 14:31           ` Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6d838647-e07c-4713-a5a4-c43ec57cf526@www.fastmail.com \
    --to=a@ajgrf.com \
    --cc=35348@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).