diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-13 23:39:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-13 23:39:27 +0200 |
| commit | f7175626ffce578be1bc6df4916a129f86557872 (patch) | |
| tree | 2eb0040522f2883764b3e09dc36595d68eeb14c1 /gnu/packages/pretty-print.scm | |
| parent | 2b6ecdf41a09ab9ecae06d7c537583a2f0f28efc (diff) | |
| parent | e8c5533d26b4441c96e9ae92350efcb24d787c4b (diff) | |
| download | guix-f7175626ffce578be1bc6df4916a129f86557872.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/pretty-print.scm')
| -rw-r--r-- | gnu/packages/pretty-print.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 12ec1f7889..b247cf21e1 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com> @@ -230,6 +230,18 @@ to @code{IOStreams}.") #:parallel-tests? #f ;There appear to be race conditions #:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + ;; 'doc/Makefile.am' tries to run stuff even when + ;; cross-compiling. Explicitly skip it. + ;; XXX: Inline this on next rebuild cycle. + `((add-before 'build 'skip-doc-directory + (lambda _ + (substitute* "Makefile" + (("^SUBDIRS = (.*) doc(.*)$" _ before after) + (string-append "SUBDIRS = " before + " " after "\n"))) + #t))) + '()) (add-before 'check 'patch-test-files (lambda _ ;; Unpatch shebangs in test input so that source-highlight |