From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5HxH-0003tm-QS for guix-patches@gnu.org; Sat, 16 Mar 2019 18:39:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5HxG-0001wy-Cl for guix-patches@gnu.org; Sat, 16 Mar 2019 18:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33245) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h5HxG-0001wr-3T for guix-patches@gnu.org; Sat, 16 Mar 2019 18:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h5HxG-000386-0b for guix-patches@gnu.org; Sat, 16 Mar 2019 18:39:02 -0400 Subject: [bug#34887] [PATCH] Create Package for Go v1.12.1 Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:53106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5Hwy-0003g6-Dj for guix-patches@gnu.org; Sat, 16 Mar 2019 18:38:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5Hit-0003GU-2d for guix-patches@gnu.org; Sat, 16 Mar 2019 18:24:12 -0400 Received: from mail-it1-x12c.google.com ([2607:f8b0:4864:20::12c]:39137) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h5His-0003GI-MJ for guix-patches@gnu.org; Sat, 16 Mar 2019 18:24:11 -0400 Received: by mail-it1-x12c.google.com with SMTP id l15so16227436iti.4 for ; Sat, 16 Mar 2019 15:24:10 -0700 (PDT) Received: from gazelle-pro (172-221-246-205.dhcp.chtrptr.net. [172.221.246.205]) by smtp.gmail.com with ESMTPSA id s10sm2376096ioc.54.2019.03.16.15.24.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Mar 2019 15:24:08 -0700 (PDT) From: Katherine Cox-Buday Date: Sat, 16 Mar 2019 17:24:06 -0500 Message-ID: <87mulu31bt.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34887@debbugs.gnu.org --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-Create-Package-for-Go-v1.12.1.patch Content-Transfer-Encoding: quoted-printable >From a1e39884b9d4f876e64406d94ee3f8c554d62a5d Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Sat, 16 Mar 2019 16:24:56 -0500 Subject: [PATCH] Create Package for Go v1.12.1 --- gnu/packages/golang.scm | 188 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 187 insertions(+), 1 deletion(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4bcd5cfcf..e24ed8dde 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12,7 +12,7 @@ ;;; Copyright =C2=A9 2018 Tom=C3=A1=C5=A1 =C4=8Cech ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby ;;; Copyright =C2=A9 2018 Pierre Neidhardt -;;; Copyright @ 2018 Katherine Cox-Buday +;;; Copyright @ 2018, 2019 Katherine Cox-Buday ;;; ;;; This file is part of GNU Guix. ;;; @@ -413,6 +413,192 @@ in the style of communicating sequential processes (@= dfn{CSP}).") ,@(package-native-inputs go-1.4))) (supported-systems %supported-systems))) =20 + +(define-public go-1.12 + (package + (inherit go-1.4) + (name "go") + (version "1.12.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://storage.googleapis.com/golang/" + name version ".src.tar.gz")) + (sha256 + (base32 + "12l12mmgqvy3nbscy7sz83qj4m6iz5a322aq9sk45f7l9ml2gq8b")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.4) + ((#:phases phases) + `(modify-phases ,phases + (replace 'prebuild + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") = "/lib")) + (ld (string-append (assoc-ref inputs "libc") "/lib")) + (loader (car (find-files ld "^ld-linux.+"))) + (net-base (assoc-ref inputs "net-base")) + (tzdata-path + (string-append (assoc-ref inputs "tzdata") "/share/= zoneinfo")) + (output (assoc-ref outputs "out"))) + + ;; A side effect of these test scripts is testing + ;; cgo. Attempts at using cgo flags and directives with t= hese + ;; scripts as specified here (https://golang.org/cmd/cgo/) + ;; have not worked. The tests continue to state that they= can + ;; not find object files/headers despite being present. + (for-each + delete-file + '("cmd/go/testdata/script/mod_case_cgo.txt" + "cmd/go/testdata/script/list_find.txt" + "cmd/go/testdata/script/list_compiled_imports.txt" + "cmd/go/testdata/script/cgo_syso_issue29253.txt")) + + (substitute* "os/os_test.go" + (("/usr/bin") (getcwd)) + (("/bin/pwd") (which "pwd")) + (("/bin/sh") (which "sh"))) + + (substitute* "cmd/vendor/golang.org/x/sys/unix/syscall_un= ix_test.go" + (("/usr/bin") "/tmp")) + + ;; Add libgcc to runpath + (substitute* "cmd/link/internal/ld/lib.go" + (("!rpath.set") "true")) + (substitute* "cmd/go/internal/work/gccgo.go" + (("cgoldflags :=3D \\[\\]string\\{\\}") + (string-append "cgoldflags :=3D []string{" + "\"-rpath=3D" gcclib "\"" + "}")) + (("\"-lgcc_s\", ") + (string-append + "\"-Wl,-rpath=3D" gcclib "\", \"-lgcc_s\", "))) + (substitute* "cmd/go/internal/work/gc.go" + (("ldflags =3D setextld\\(ldflags, compiler\\)") + (string-append + "ldflags =3D setextld(ldflags, compiler)\n" + "ldflags =3D append(ldflags, \"-r\")\n" + "ldflags =3D append(ldflags, \"" gcclib "\")\n"))) + + ;; Disable failing tests: these tests attempt to access + ;; commands or network resources which are neither availa= ble + ;; nor necessary for the build to succeed. + (for-each + (match-lambda + ((file regex) + (substitute* file + ((regex all before test_name) + (string-append before "Disabled" test_name))))) + '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") + ("net/dial_test.go" "(.+)(TestDialTimeout.+)") + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPort.+)") + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPortWithCan= cel.+)") + ;; 127.0.0.1 doesn't exist + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTR.+)") + ;; 127.0.0.1 doesn't exist + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTRWithCanc= el.+)") + ;; /etc/services doesn't exist + ("net/parse_test.go" "(.+)(TestReadLine.+)") + ("os/os_test.go" "(.+)(TestHostname.+)") + ;; The user's directory doesn't exist + ("os/os_test.go" "(.+)(TestUserHomeDir.+)") + ("time/format_test.go" "(.+)(TestParseInSydney.+)") + ("time/format_test.go" "(.+)(TestParseInLocation.+)") + ("os/exec/exec_test.go" "(.+)(TestEcho.+)") + ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.= +)") + ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") + ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)= ") + ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") + ("os/exec/exec_test.go" "(.+)(TestPipes.+)") + ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") + ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuc= cess.+)") + ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)= ") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+= )") + ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") + ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") + ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.= +)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") + ("net/lookup_test.go" "(.+)(TestLookupPort.+)") + ("syscall/exec_linux_test.go" + "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.= +)"))) + + ;; fix shebang for testar script + ;; note the target script is generated at build time. + (substitute* "../misc/cgo/testcarchive/carchive_test.go" + (("#!/usr/bin/env") (string-append "#!" (which "env")))) + + (substitute* "net/lookup_unix.go" + (("/etc/protocols") (string-append net-base "/etc/proto= cols"))) + (substitute* "net/port_unix.go" + (("/etc/services") (string-append net-base "/etc/servic= es"))) + (substitute* "time/zoneinfo_unix.go" + (("/usr/share/zoneinfo/") tzdata-path)) + (substitute* (find-files "cmd" "\\.go") + (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) + #t))) + (add-before 'build 'set-bootstrap-variables + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Tell the build system where to find the bootstrap Go. + (let ((go (assoc-ref inputs "go"))) + (setenv "GOROOT_BOOTSTRAP" go) + (setenv "GOGC" "400") + #t))) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; FIXME: Some of the .a files are not bit-reproducible. + (let* ((output (assoc-ref outputs "out"))) + (setenv "CC" (which "gcc")) + (setenv "GOOS" "linux") + (setenv "GOROOT" (dirname (getcwd))) + (setenv "GOROOT_FINAL" output) + (setenv "CGO_ENABLED" "1") + (invoke "sh" "all.bash")))) + + (replace 'install + ;; TODO: Most of this could be factorized with Go 1.4. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((output (assoc-ref outputs "out")) + (doc_out (assoc-ref outputs "doc")) + (docs (string-append doc_out "/share/doc/" ,name "-"= ,version)) + (src (string-append + (assoc-ref outputs "tests") "/share/" ,name "-= " ,version))) + (delete-file-recursively "../pkg/bootstrap") + ;; Prevent installation of the build cache, which contains + ;; store references to most of the tools used to build Go= and + ;; would unnecessarily increase the size of Go's closure = if it + ;; was installed. + (delete-file-recursively "../pkg/obj") + + (mkdir-p src) + (copy-recursively "../test" (string-append src "/test")) + (delete-file-recursively "../test") + (mkdir-p docs) + (copy-recursively "../api" (string-append docs "/api")) + (delete-file-recursively "../api") + (copy-recursively "../doc" (string-append docs "/doc")) + (delete-file-recursively "../doc") + + (for-each + (lambda (file) + (let* ((filein (string-append "../" file)) + (fileout (string-append docs "/" file))) + (copy-file filein fileout) + (delete-file filein))) + ;; Note the slightly different file names compared to 1.= 4. + '("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS" + "LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt")) + + (copy-recursively "../" output) + #t))))))) + (native-inputs + `(("go" ,go-1.4) + ,@(match (%current-system) + ((or "armhf-linux" "aarch64-linux") + `(("gold" ,binutils-gold))) + (_ `())) + ,@(package-native-inputs go-1.4))) + (supported-systems %supported-systems))) + (define-public go go-1.11) =20 (define-public go-github-com-alsm-ioprogress --=20 2.17.1 --=-=-= Content-Type: text/plain -- Katherine --=-=-=--