mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: Remove Go 1.9.
* gnu/packages/golang.scm (go-1.9): Remove variable. (go-1.11): Inherit from go-1.4 and consolidate the inherited build phases from go-1.9. Go 1.11 should be essentially unchanged with this commit, although the derivation is different.
This commit is contained in:
Leo Famulari
parent
a503071797
commit
5a14b913ad
1 changed files with 59 additions and 197 deletions
|
|
@ -223,192 +223,9 @@ (define-public go-1.4
|
|||
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux"))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-1.9
|
||||
(package
|
||||
(inherit go-1.4)
|
||||
(name "go")
|
||||
(version "1.9.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://storage.googleapis.com/golang/"
|
||||
name version ".src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08kpy874x0rx43zpyv5kwd8xj2ma91xm33i0ka2v1v788px18a2q"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments go-1.4)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(replace 'prebuild
|
||||
;; TODO: Most of this could be factorized with Go 1.4.
|
||||
(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")))
|
||||
|
||||
;; Removing net/ tests, which fail when attempting to access
|
||||
;; network resources not present in the build container.
|
||||
(for-each delete-file
|
||||
'("net/listen_test.go"
|
||||
"net/parse_test.go"
|
||||
"net/cgo_unix_test.go"))
|
||||
|
||||
(substitute* "os/os_test.go"
|
||||
(("/usr/bin") (getcwd))
|
||||
(("/bin/pwd") (which "pwd"))
|
||||
(("/bin/sh") (which "sh")))
|
||||
|
||||
;; Add libgcc to runpath
|
||||
(substitute* "cmd/link/internal/ld/lib.go"
|
||||
(("!rpath.set") "true"))
|
||||
(substitute* "cmd/go/internal/work/build.go"
|
||||
(("cgoldflags := \\[\\]string\\{\\}")
|
||||
(string-append "cgoldflags := []string{"
|
||||
"\"-rpath=" gcclib "\""
|
||||
"}"))
|
||||
(("ldflags = setextld\\(ldflags, compiler\\)")
|
||||
(string-append
|
||||
"ldflags = setextld(ldflags, compiler)\n"
|
||||
"ldflags = append(ldflags, \"-r\")\n"
|
||||
"ldflags = append(ldflags, \"" gcclib "\")\n"))
|
||||
(("\"-lgcc_s\", ")
|
||||
(string-append
|
||||
"\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", ")))
|
||||
|
||||
;; XXX Commit 65fa2b615b72c1fa61a7 in the Go repo. We do this
|
||||
;; without a patch because ((guix packages) patch-and-repack)
|
||||
;; resets file mtimes, and parts of Go's test suite rely on
|
||||
;; those timestamps.
|
||||
;; <https://github.com/golang/go/issues/26369>
|
||||
(substitute* "cmd/internal/objfile/elf.go"
|
||||
(("PT_LOAD")
|
||||
"PT_LOAD && p.Flags&elf.PF_X != 0"))
|
||||
|
||||
;; Disable failing tests: these tests attempt to access
|
||||
;; commands or network resources which are neither available
|
||||
;; 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.+)")
|
||||
("os/os_test.go" "(.+)(TestHostname.+)")
|
||||
("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" "(.+)(TestIgnorePipeErrorOnSuccess.+)")
|
||||
("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.+)")))
|
||||
|
||||
(substitute* "../misc/cgo/testsanitizers/test.bash"
|
||||
(("(CC=)cc" all var) (string-append var "gcc")))
|
||||
|
||||
;; 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/protocols")))
|
||||
(substitute* "net/port_unix.go"
|
||||
(("/etc/services") (string-append net-base "/etc/services")))
|
||||
(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"))
|
||||
(out (assoc-ref outputs "out")))
|
||||
(setenv "GOROOT_BOOTSTRAP" go)
|
||||
(setenv "PATH"
|
||||
(string-append out "/bin:"
|
||||
(dirname (getcwd)) "/bin:"
|
||||
(getenv "PATH")))
|
||||
|
||||
;; XXX: The following variables seem unrelated.
|
||||
(setenv "GOGC" "400")
|
||||
(setenv "GO_TEST_TIMEOUT_SCALE" "9999")
|
||||
#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")
|
||||
|
||||
(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-1.11
|
||||
(package
|
||||
(inherit go-1.9)
|
||||
(inherit go-1.4)
|
||||
(name "go")
|
||||
(version "1.11.5")
|
||||
(source
|
||||
|
|
@ -420,7 +237,7 @@ (define-public go-1.11
|
|||
(base32
|
||||
"0gllmbjvp12iszwils8id78mvjxwviwf98lh2gdkb236n4mz07mw"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments go-1.9)
|
||||
(substitute-keyword-arguments (package-arguments go-1.4)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
;; XXX Work around the Go 1.11.5 tarbomb.
|
||||
|
|
@ -535,23 +352,68 @@ (define-public go-1.11
|
|||
(substitute* (find-files "cmd" "\\.go")
|
||||
(("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader))
|
||||
#t)))
|
||||
;; 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.
|
||||
;; TODO This should be moved into the 'install' phase when Go 1.9 is
|
||||
;; removed.
|
||||
(add-before 'install 'delete-extraneous-files
|
||||
(lambda _
|
||||
(delete-file-recursively "../pkg/obj")
|
||||
#t))
|
||||
(replace 'set-bootstrap-variables
|
||||
(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)))))))))
|
||||
#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)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue