diff options
| author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-03-20 00:38:16 +0800 |
|---|---|---|
| committer | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-05-14 00:24:12 +0800 |
| commit | 38598c693f67eb75f4152dbdc5d1846e0befd62d (patch) | |
| tree | 0447f37eb12fbedb6ec09d86a7cbd5501d229792 | |
| parent | ecfd88cbe34551ebdae92c7c6bb5888bbd0993d6 (diff) | |
| download | guix-patches-38598c693f67eb75f4152dbdc5d1846e0befd62d.tar guix-patches-38598c693f67eb75f4152dbdc5d1846e0befd62d.tar.gz | |
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
| -rw-r--r-- | gnu/packages/textutils.scm | 13 |
1 files 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 <gabriel@erlikon.ch> ;;; Copyright © 2023 Reza Housseini <reza@housseini.me> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Timotej Lazar <timotej.lazar@araneo.si>;; ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@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" |