From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 69900@debbugs.gnu.org
Subject: [bug#69900] [PATCH 2/2] gnu: foot: Fix cross-compilation.
Date: Wed, 20 Mar 2024 00:38:17 +0800 [thread overview]
Message-ID: <c26b921750657b95b12225e0ff191e805037eba6.1710866094.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <cover.1710866094.git.zhengjunjie@iscas.ac.cn>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2468 bytes --]
* 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@dismail.de>
;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2024 Suhail <suhail@bayesians.ca>
;;; Copyright © 2024 Clément Lassieur <clement@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
next prev parent reply other threads:[~2024-03-19 16:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 16:35 [bug#69900] [PATCH 0/2] Fix utf8proc and foot cross-compilation Zheng Junjie
2024-03-19 16:38 ` [bug#69900] [PATCH 1/2] gnu: utf8proc: fix cross-compilation Zheng Junjie
2024-03-19 16:38 ` Zheng Junjie [this message]
2024-05-13 16:38 ` bug#69900: [PATCH 0/2] Fix utf8proc and foot cross-compilation Zheng Junjie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c26b921750657b95b12225e0ff191e805037eba6.1710866094.git.zhengjunjie@iscas.ac.cn \
--to=zhengjunjie@iscas.ac.cn \
--cc=69900@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).