GNU bug report logs - #66593
[PATCH] gnu: cups: Fix cross-compiling.

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 66593 in the body.
You can then email your comments to 66593 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] gnu: cups: Fix cross-compiling.
Date: Tue, 17 Oct 2023 22:43:56 +0800

* gnu/packages/cups.scm (cups-filters)[native-inputs]: When cross-compiling
add cups-minimal.
(cups-minimal)[native-inputs]: When cross-compiling add this-package.
---
 gnu/packages/cups.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 647b89dc03..fc26fd70ca 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
 ;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -204,8 +205,11 @@ (define-public cups-filters
                     (find-files (string-append #$output
                                                "/lib/cups/filter"))))))))
     (native-inputs
-     (list `(,glib "bin")               ; for gdbus-codegen
-           pkg-config))
+     (append (if (%current-target-system)
+                 (list cups-minimal)
+                 '())
+             (list `(,glib "bin")               ; for gdbus-codegen
+                   pkg-config)))
     (inputs
      (list avahi
            fontconfig
@@ -315,7 +319,10 @@ (define-public cups-minimal
                      ;; to a missing font.  Substitute the last observed count.
                      (("(\\$count != )33" _ prefix)
                       (string-append prefix "39"))))))))
-    (native-inputs (list config pkg-config))
+    (native-inputs (cons* config pkg-config
+                          (if (%current-target-system)
+                              (list this-package)
+                              '())))
     (inputs (list zlib gnutls))
     (home-page "https://openprinting.github.io/cups")
     (synopsis "The Common Unix Printing System")

base-commit: e80022ff3adde3184bed6758f604e3aa12942865
-- 
2.41.0

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

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 66593-done <at> debbugs.gnu.org
Subject: Re: [bug#66593] [PATCH] gnu: cups: Fix cross-compiling.
Date: Thu, 26 Oct 2023 10:31:48 +0200

> * gnu/packages/cups.scm (cups-filters)[native-inputs]: When cross-compiling
> add cups-minimal.
> (cups-minimal)[native-inputs]: When cross-compiling add this-package.

Tested with:

--8<---------------cut here---------------start------------->8---
./pre-inst-env guix build cups --target=aarch64-linux-gnu
--8<---------------cut here---------------end--------------->8---

and builds fine.

Applied, thanks!

Mathieu

Previous Next

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