me
/
guix
Archived
1
0
Fork 0

gnu: source-highlight: Allow cross-compilation.

* gnu/packages/pretty-print.scm (source-highlight)[arguments]: Add
'skip-doc-directory' when (%current-target-system) is true.
master
Ludovic Courtès 2020-10-09 23:31:18 +02:00
parent 7b7b468ea4
commit 2f4b51ab22
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 1 deletions

View File

@ -2,7 +2,7 @@
;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; 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 © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
@ -230,6 +230,18 @@ to @code{IOStreams}.")
#:parallel-tests? #f ;There appear to be race conditions #:parallel-tests? #f ;There appear to be race conditions
#:phases #:phases
(modify-phases %standard-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 (add-before 'check 'patch-test-files
(lambda _ (lambda _
;; Unpatch shebangs in test input so that source-highlight ;; Unpatch shebangs in test input so that source-highlight