[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: go-1.13: Target aarch64-linux for aarch64-linux.
From: |
guix-commits |
Subject: |
02/03: gnu: go-1.13: Target aarch64-linux for aarch64-linux. |
Date: |
Tue, 23 Jun 2020 13:23:51 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 9b03299544e540ad5975abb306c19eb0168aa5e1
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Jun 23 19:00:56 2020 +0300
gnu: go-1.13: Target aarch64-linux for aarch64-linux.
Fixes <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34872>.
* gnu/packages/golang.scm (go-1.13)[arguments]: Set system to
aarch64-linux when building for aarch64-linux. Adjust 'prebuild phase
to skip tests which fail on aarch64-linux.
---
gnu/packages/golang.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c371bf4..c5ca0d0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -233,6 +233,11 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
"07gksk9194wa90xyd6yhagxfv7syvsx29bh8ypc4mg700vc1kfrl"))))
(arguments
(substitute-keyword-arguments (package-arguments go-1.4)
+ ((#:system system)
+ (if (string-prefix? "aarch64-linux" (or (%current-system)
+ (%current-target-system)))
+ "aarch64-linux"
+ system))
((#:phases phases)
`(modify-phases ,phases
(replace 'prebuild
@@ -329,6 +334,10 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
("syscall/exec_linux_test.go"
"(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)")))
+ ;; These tests fail on aarch64-linux
+ (substitute* "cmd/dist/test.go"
+ (("t.registerHostTest\\(\"testsanitizers/msan.*") ""))
+
;; fix shebang for testar script
;; note the target script is generated at build time.
(substitute* "../misc/cgo/testcarchive/carchive_test.go"