diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-04-05 15:53:38 +0300 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-12 08:27:03 -0400 |
| commit | 4c229df532b3cd1015cc63aba451920ff740acbb (patch) | |
| tree | ba0b41539ca07c8864baf6f8caa3cae06c0659bf /gnu/packages/golang.scm | |
| parent | df973437758e52c148a677a8afbe120ab1c7ed1d (diff) | |
gnu: go-1.17: Fix test suite on powerpc64le-linux.
* gnu/packages/golang.scm (go-1.17)[arguments]: Use custom
'patch-gcc:lib phase on powerpc64le-linux. Add a phase to adjust the
allowed size of an executable in the test suite.
[inputs]: Keep gcc:lib as an input on powerpc64le-linux.
(go-1.18)[arguments]: Delete custom 'adjust-test-suite phase.
Diffstat (limited to 'gnu/packages/golang.scm')
| -rw-r--r-- | gnu/packages/golang.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 31022eb1d5..89f2192274 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -700,7 +700,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute* "src/time/zoneinfo_unix.go" (("/usr/share/zoneinfo/") tzdata-path))))) ;; Keep this synchronized with the package inputs. - ,@(if (target-arm?) + ,@(if (or (target-arm?) (target-ppc64le?)) '((add-after 'unpack 'patch-gcc:lib (lambda* (#:key inputs #:allow-other-keys) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))) @@ -722,6 +722,13 @@ in the style of communicating sequential processes (@dfn{CSP}).") "ldflags = append(ldflags, \"-r\")\n" "ldflags = append(ldflags, \"" gcclib "\")\n"))))))) '()) + ;; Backported from later versions of go to workaround 64k page sizes. + ,@(if (target-ppc64le?) + '((add-after 'unpack 'adjust-test-suite + (lambda _ + (substitute* "misc/cgo/testshared/shared_test.go" + (("100000") "256000"))))) + '()) (add-after 'patch-source 'disable-failing-tests (lambda _ ;; Disable failing tests: these tests attempt to access @@ -833,7 +840,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (install-file file (string-append out "/share/doc/go"))) '("AUTHORS" "CONTRIBUTORS" "CONTRIBUTING.md" "PATENTS" "README.md" "SECURITY.md")))))))) - (inputs (if (not (target-arm?)) + (inputs (if (not (or (target-arm?) (target-ppc64le?))) (alist-delete "gcc:lib" (package-inputs go-1.16)) (package-inputs go-1.16))))) @@ -856,6 +863,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute-keyword-arguments (package-arguments go-1.17) ((#:phases phases) `(modify-phases ,phases + (delete 'adjust-test-suite) ;; See the platforms using this phase in go-1.17. (replace 'patch-gcc:lib (lambda* (#:key inputs #:allow-other-keys) |