guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: source-highlight: Allow cross-compilation.


From: guix-commits
Subject: 02/03: gnu: source-highlight: Allow cross-compilation.
Date: Fri, 9 Oct 2020 18:00:53 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 2f4b51ab22b312b11656f70e2dd08290592358d3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Oct 9 23:31:18 2020 +0200

    gnu: source-highlight: Allow cross-compilation.
    
    * gnu/packages/pretty-print.scm (source-highlight)[arguments]: Add
    'skip-doc-directory' when (%current-target-system) is true.
---
 gnu/packages/pretty-print.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 12ec1f7..b247cf2 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]