01/05: gnu: cups-minimal: Fix cross-building to riscv64-linux.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 9def25b458da4a749fd9a7c3db1446a5362a2f9b
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/";)