unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Z572 via Guix-patches via <guix-patches@gnu.org>
To: 61865@debbugs.gnu.org
Subject: [bug#61865] [PATCH 4/8] gnu: mtdev: fix riscv64 cross-compile.
Date: Tue, 28 Feb 2023 16:33:36 +0800	[thread overview]
Message-ID: <tencent_EE34E5AE2576B5BE9B4AA9CE596C7F7E3A08@qq.com> (raw)
In-Reply-To: <cover.1677572540.git.873216071@qq.com>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2406 bytes --]

* gnu/packages/xdisorg.scm(mtdev): fix riscv64 cross-compile
[arguments]: when target is riscv64, add phase to update config.{guess,sub}.
[native-inputs]: when target is riscv64, add config.
---
 gnu/packages/xdisorg.scm | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 2ebeb4e013..21bc368538 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -41,7 +41,7 @@
 ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
 ;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org>
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
-;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2020, 2021, 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
@@ -763,7 +763,23 @@ (define-public mtdev
          (base32
           "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"))))
     (build-system gnu-build-system)
-    (arguments '(#:configure-flags '("--disable-static")))
+    (arguments `(#:configure-flags '("--disable-static")
+                 ,@(if (target-riscv64?)
+                       `(#:phases
+                         (modify-phases %standard-phases
+                           (add-after 'unpack 'update-config-scripts
+                             (lambda* (#:key inputs native-inputs #:allow-other-keys)
+                               ;; Replace outdated config.guess and config.sub.
+                               (for-each (lambda (file)
+                                           (install-file
+                                            (search-input-file
+                                             (or native-inputs inputs)
+                                             (string-append "/bin/" file)) "./config-aux"))
+                                         '("config.guess" "config.sub"))))))
+                       '())))
+    (native-inputs (if (target-riscv64?)
+                       (list config)
+                       '()))
     (home-page "http://bitmath.org/code/mtdev/")
     (synopsis "Multitouch protocol translation library")
     (description "Mtdev is a stand-alone library which transforms all
-- 
2.39.1





  parent reply	other threads:[~2023-02-28  8:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1677572540.git.873216071@qq.com>
2023-02-28  8:33 ` [bug#61865] [PATCH 1/8] gnu: xcb-util-wm: fix riscv64 cross-compile Z572 via Guix-patches via
2023-02-28  8:33 ` [bug#61865] [PATCH 2/8] gnu: libxv: " Z572 via Guix-patches via
2023-06-04 12:19   ` Efraim Flashner
2023-02-28  8:33 ` [bug#61865] [PATCH 3/8] gnu: libxtst: " Z572 via Guix-patches via
2023-02-28  8:33 ` Z572 via Guix-patches via [this message]
2023-02-28  8:33 ` [bug#61865] [PATCH 5/8] gnu: gobject-introspection: " Z572 via Guix-patches via
2023-02-28  8:33 ` [bug#61865] [PATCH 6/8] gnu: gsettings-desktop-schemas: fix cross-compile Z572 via Guix-patches via
2023-02-28  8:33 ` [bug#61865] [PATCH 7/8] gnu: libotf: " Z572 via Guix-patches via
2023-06-04 12:19   ` Efraim Flashner
2023-02-28  8:33 ` [bug#61865] [PATCH 8/8] gnu: librsvg-2.40: " Z572 via Guix-patches via
2023-06-04 12:20   ` Efraim Flashner

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=tencent_EE34E5AE2576B5BE9B4AA9CE596C7F7E3A08@qq.com \
    --to=guix-patches@gnu.org \
    --cc=61865@debbugs.gnu.org \
    --cc=873216071@qq.com \
    /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).