GNU bug report logs - #69900
[PATCH 0/2] Fix utf8proc and foot cross-compilation.

Previous Next

Full log

Message #11 received at 69900 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69900 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: utf8proc: fix cross-compilation.
Date: Wed, 20 Mar 2024 00:38:16 +0800

* gnu/packages/textutils.scm (utf8proc): fix cross-compilation.
[arguments]<#:make-flags>: Use CC-FOR-TARGET.
<#:phases>: When cross-compilation, Get test data from native-inputs.

Change-Id: I42699e62f28585cc215a8843b5daad9c52af44c9
---
 gnu/packages/textutils.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 25de916fcb..b4855392d6 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -27,7 +27,7 @@
 ;;; Copyright © 2022 Gabriel Wicki <gabriel <at> erlikon.ch>
 ;;; Copyright © 2023 Reza Housseini <reza <at> housseini.me>
 ;;; Copyright © 2023 Hilton Chain <hako <at> ultrarare.space>
-;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2024 Timotej Lazar <timotej.lazar <at> araneo.si>;;
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus <at> gmail.com>
 ;;;
@@ -197,15 +197,20 @@ (define-public utf8proc
          ;; For tests.
          ("perl" ,perl))))
     (arguments
-     '(#:make-flags (list "CC=gcc"
+     `(#:make-flags (list ,(string-append "CC=" (cc-for-target))
                           (string-append "prefix=" (assoc-ref %outputs "out")))
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
          (add-before 'check 'check-data
-           (lambda* (#:key inputs #:allow-other-keys)
+           (lambda* (#:key ,@(if (%current-target-system)
+                                 '(native-inputs)
+                                 '())
+                     inputs #:allow-other-keys)
              (for-each (lambda (i)
-                         (copy-file (assoc-ref inputs i)
+                         (copy-file (assoc-ref ,@(if (%current-target-system)
+                                                     '((or native-inputs inputs))
+                                                     '(inputs)) i)
                                     (string-append "data/" i)))
                        '("NormalizationTest.txt" "GraphemeBreakTest.txt"))
              (substitute* "data/GraphemeBreakTest.txt"
-- 
2.41.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.