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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69900 in the body.
You can then email your comments to 69900 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Fix utf8proc and foot cross-compilation.
Date: Wed, 20 Mar 2024 00:35:51 +0800

Zheng Junjie (2):
  gnu: utf8proc: fix cross-compilation.
  gnu: foot: Fix cross-compilation.

 gnu/packages/terminals.scm | 17 ++++++++++++-----
 gnu/packages/textutils.scm | 13 +++++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)


base-commit: ee11b22fcc7d8b42847e9d940ce5be3bc0d4f880
-- 
2.41.0

Message #8 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 2/2] gnu: foot: Fix cross-compilation.
Date: Wed, 20 Mar 2024 00:38:17 +0800

* gnu/packages/terminals.scm (foot): Fix cross-compilation.
[arguments]<#:configure-flags>: When cross-compilation, Remove -Db_lto=true.
[native-inputs]: When cross-compilation, Add wayland, pkg-config-for-build.
[inputs]: Add wayland-protocols.

Change-Id: Ia56d2583254bd9ab463e5b39859eae8eb5092c9b
---
 gnu/packages/terminals.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index f0ae4d4d4d..651e93b60f 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -36,7 +36,7 @@
 ;;; Copyright © 2022, 2023 jgart <jgart <at> dismail.de>
 ;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us <at> ieee.org>
 ;;; Copyright © 2023 Foundation Devices, Inc. <hello <at> foundationdevices.com>
-;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme <at> runbox.com>
 ;;; Copyright © 2024 Suhail <suhail <at> bayesians.ca>
 ;;; Copyright © 2024 Clément Lassieur <clement <at> lassieur.org>
@@ -865,16 +865,23 @@ (define-public foot
       ;; also to address a GCC 10 issue when doing PGO builds.
       #:build-type "release"
       ;; Enable LTO as recommended by INSTALL.md.
-      #:configure-flags #~'("-Db_lto=true")))
-    (native-inputs (list ncurses ;for 'tic'
-                         pkg-config scdoc wayland-protocols))
+      ;; when cross-compilation, enable lto will fail.
+      #:configure-flags (if (%current-target-system)
+                            #~'()
+                            #~'("-Db_lto=true"))))
+    (native-inputs (append
+                    (if (%current-target-system)
+                        (list wayland pkg-config-for-build)
+                        '())
+                    (list ncurses ;for 'tic'
+                          pkg-config scdoc wayland-protocols)))
     (native-search-paths
      ;; FIXME: This should only be located in 'ncurses'.  Nonetheless it is
      ;; provided for usability reasons.  See <https://bugs.gnu.org/22138>.
      (list (search-path-specification
             (variable "TERMINFO_DIRS")
             (files '("share/terminfo")))))
-    (inputs (list fcft libxkbcommon wayland))
+    (inputs (list fcft libxkbcommon wayland wayland-protocols))
     (synopsis "Wayland-native terminal emulator")
     (description
      "@command{foot} is a terminal emulator for systems using the Wayland
-- 
2.41.0

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

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69900-done <at> debbugs.gnu.org
Subject: Re: [bug#69900] [PATCH 0/2] Fix utf8proc and foot cross-compilation.
Date: Tue, 14 May 2024 00:38:40 +0800

[Message part 1 (text/plain, inline)]

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> Zheng Junjie (2):
>   gnu: utf8proc: fix cross-compilation.
>   gnu: foot: Fix cross-compilation.
>
>  gnu/packages/terminals.scm | 17 ++++++++++++-----
>  gnu/packages/textutils.scm | 13 +++++++++----
>  2 files changed, 21 insertions(+), 9 deletions(-)
>
>
> base-commit: ee11b22fcc7d8b42847e9d940ce5be3bc0d4f880

push, see
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=38598c693f67eb75f4152dbdc5d1846e0befd62d
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=40af021e28102d2f4b2e4b2b3c302f487cb1f591

[signature.asc (application/pgp-signature, inline)]

Previous Next

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