z572 pushed a commit to branch master
in repository guix.
commit 38598c693f67eb75f4152dbdc5d1846e0befd62d
Author: Zheng Junjie <zhengjun...@iscas.ac.cn>
AuthorDate: Wed Mar 20 00:38:16 2024 +0800
gnu: utf8proc: fix cross-compilation.
* 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 9d3b93faf9..b58038dcc2 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -27,7 +27,7 @@
;;; Copyright © 2022 Gabriel Wicki <gabr...@erlikon.ch>
;;; Copyright © 2023 Reza Housseini <r...@housseini.me>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
-;;; Copyright © 2023 Zheng Junjie <873216...@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216...@qq.com>
;;; Copyright © 2024 Timotej Lazar <timotej.la...@araneo.si>;;
;;; Copyright © 2024 Sharlatan Hellseher <sharlata...@gmail.com>
;;;
@@ -199,15 +199,20 @@ libenca and several charset conversion libraries and
tools.")
;; 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"
