diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 11:31:37 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 11:34:18 +0200 |
| commit | ae71bef532d6b1c9d1481a3ac65827f148b1e45b (patch) | |
| tree | cdb88a58c19d014f749e062a9c575747b7769706 /gnu | |
| parent | b938892551816aedd01fd32b7eb1d5e061afce32 (diff) | |
gnu: go@1.12: Apply patch from a build phase.
This is a followup to b938892551816aedd01fd32b7eb1d5e061afce32.
* gnu/packages/golang.scm (go-1.12)[source]: Remove 'patches'.
[arguments]: In 'pre-build' phase, invoke "patch".
[native-inputs]: Add "go-skip-gc-test.patch".
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/golang.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 128e62beef6..51be20b066a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm | |||
| @@ -409,8 +409,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") | |||
| 409 | name version ".src.tar.gz")) | 409 | name version ".src.tar.gz")) |
| 410 | (sha256 | 410 | (sha256 |
| 411 | (base32 | 411 | (base32 |
| 412 | "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")) | 412 | "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")))) |
| 413 | (patches (search-patches "go-skip-gc-test.patch")))) | ||
| 414 | (arguments | 413 | (arguments |
| 415 | (substitute-keyword-arguments (package-arguments go-1.4) | 414 | (substitute-keyword-arguments (package-arguments go-1.4) |
| 416 | ((#:phases phases) | 415 | ((#:phases phases) |
| @@ -425,6 +424,12 @@ in the style of communicating sequential processes (@dfn{CSP}).") | |||
| 425 | (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) | 424 | (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) |
| 426 | (output (assoc-ref outputs "out"))) | 425 | (output (assoc-ref outputs "out"))) |
| 427 | 426 | ||
| 427 | ;; Having the patch in the 'patches' field of <origin> breaks | ||
| 428 | ;; the 'TestServeContent' test due to the fact that | ||
| 429 | ;; timestamps are reset. Thus, apply it from here. | ||
| 430 | (invoke "patch" "-p2" "--force" "-i" | ||
| 431 | (assoc-ref inputs "go-skip-gc-test.patch")) | ||
| 432 | |||
| 428 | ;; A side effect of these test scripts is testing | 433 | ;; A side effect of these test scripts is testing |
| 429 | ;; cgo. Attempts at using cgo flags and directives with these | 434 | ;; cgo. Attempts at using cgo flags and directives with these |
| 430 | ;; scripts as specified here (https://golang.org/cmd/cgo/) | 435 | ;; scripts as specified here (https://golang.org/cmd/cgo/) |
| @@ -576,6 +581,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") | |||
| 576 | #t))))))) | 581 | #t))))))) |
| 577 | (native-inputs | 582 | (native-inputs |
| 578 | `(("go" ,go-1.4) | 583 | `(("go" ,go-1.4) |
| 584 | ("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch")) | ||
| 579 | ,@(match (%current-system) | 585 | ,@(match (%current-system) |
| 580 | ((or "armhf-linux" "aarch64-linux") | 586 | ((or "armhf-linux" "aarch64-linux") |
| 581 | `(("gold" ,binutils-gold))) | 587 | `(("gold" ,binutils-gold))) |
