[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
226/244: gnu: cups-minimal: Fix cross-building to riscv64-linux.
From: |
guix-commits |
Subject: |
226/244: gnu: cups-minimal: Fix cross-building to riscv64-linux. |
Date: |
Wed, 12 Apr 2023 08:49:36 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 4736de9de4678c35cd9670c0b4333336aed52cd2
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Apr 10 23:12:29 2023 +0300
gnu: cups-minimal: Fix cross-building to riscv64-linux.
* gnu/packages/cups.scm (cups-minimal)[arguments]: When building for
riscv64-linux replace the config.guess and config.sub files.
[native-inputs]: When building for riscv64-linux add config.
---
gnu/packages/cups.scm | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index ba500d433e..3299cd1160 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2018, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
@@ -316,9 +316,22 @@ filters for the PDF-centric printing workflow introduced
by OpenPrinting.")
(substitute* "tools/ippeveprinter.c"
(("# else /\\* HAVE_AVAHI \\*/")
"#elif defined(HAVE_AVAHI)"))
- #t)))))
+ #t))
+ ,@(if (target-riscv64?)
+ `((add-after 'unpack 'update-config-scripts
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub")))))
+ '()))))
(native-inputs
- (list pkg-config))
+ (append (if (target-riscv64?)
+ (list config)
+ '())
+ (list pkg-config)))
(inputs
(list zlib gnutls))
(home-page "https://openprinting.github.io/")
- 222/244: gnu: s6-portable-utils: Update to 2.3.0.2., (continued)
- 222/244: gnu: s6-portable-utils: Update to 2.3.0.2., guix-commits, 2023/04/12
- 169/244: gnu: darktable: Update to 4.2.1., guix-commits, 2023/04/12
- 200/244: gnu: thunar-archive-plugin: Update to 0.5.1., guix-commits, 2023/04/12
- 202/244: gnu: xfce4-notifyd: Update to 0.8.2., guix-commits, 2023/04/12
- 204/244: gnu: xfce4-screensaver: Update to 4.18.1., guix-commits, 2023/04/12
- 207/244: gnu: emacs-treemacs: Update to 3.1., guix-commits, 2023/04/12
- 201/244: gnu: parole: Update to 4.18.0., guix-commits, 2023/04/12
- 233/244: gnu: restinio: Update to 0.6.18-0.eda471e and enable tests., guix-commits, 2023/04/12
- 210/244: gnu: emacs-citar-org-roam: Update to 0.5.1., guix-commits, 2023/04/12
- 230/244: gnu: libconfig: Replace config script helpers., guix-commits, 2023/04/12
- 226/244: gnu: cups-minimal: Fix cross-building to riscv64-linux.,
guix-commits <=
- 158/244: gnu: Remove abandoned spotify-tui package., guix-commits, 2023/04/12
- 159/244: gnu: Add sentencepiece., guix-commits, 2023/04/12
- 192/244: gnu: fcitx5-configtool: Update to 5.0.17., guix-commits, 2023/04/12
- 180/244: import: opam: opam->guix-package: Fix default repo argument., guix-commits, 2023/04/12
- 153/244: gnu: Add zix., guix-commits, 2023/04/12
- 154/244: gnu: libaudec: Update to 0.3.4., guix-commits, 2023/04/12
- 235/244: Revert "gnu: opendht: Update to 2.5.2.", guix-commits, 2023/04/12
- 168/244: gnu: scintilla: Update to 5.3.4., guix-commits, 2023/04/12
- 182/244: gnu: gerbil: Update to 0.17.0., guix-commits, 2023/04/12
- 209/244: gnu: emacs-flycheck-guile: Update to 0.5., guix-commits, 2023/04/12