emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#68084: closed ([PATCH] gnu: xcb-util-render-util: Fix cross-compilin


From: GNU bug Tracking System
Subject: bug#68084: closed ([PATCH] gnu: xcb-util-render-util: Fix cross-compiling to riscv64-linux.)
Date: Fri, 29 Dec 2023 17:10:02 +0000

Your message dated Fri, 29 Dec 2023 18:08:57 +0100
with message-id <87r0j5os0m.fsf@gnu.org>
and subject line Re: [bug#68084] [PATCH v2] gnu: xcb-util-renderutil: Fix 
cross-compiling to riscv64-linux.
has caused the debbugs.gnu.org bug report #68084,
regarding [PATCH] gnu: xcb-util-render-util: Fix cross-compiling to 
riscv64-linux.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
68084: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68084
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- Subject: [PATCH] gnu: xcb-util-render-util: Fix cross-compiling to riscv64-linux. Date: Thu, 28 Dec 2023 22:22:49 +0800
* gnu/packages/xorg.scm (xcb-util-render-util)
[native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
[arguments]: When target riscv64-linux-gnu, add update-config-scripts phase.

Change-Id: I906a2b7b7691ae53592cfa35ba64fc7e7d735664
---
 gnu/packages/xorg.scm | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 382075237a..4f85a5de8b 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5675,11 +5675,29 @@ (define-public xcb-util-renderutil
                "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-static")))
+     `(#:configure-flags '("--disable-static")
+       ,@(if (and (%current-target-system)
+                  (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.guess" "config.sub"))))))
+             '())))
     (propagated-inputs
      (list libxcb))
     (native-inputs
-     (list pkg-config))
+     (append (if (and (%current-target-system)
+                      (target-riscv64?))
+                 (list config)
+                 '())
+             (list pkg-config)))
     (home-page "https://cgit.freedesktop.org/xcb/util-renderutil/";)
     (synopsis "Convenience functions for the Render extension")
     (description

base-commit: bc509aba838780502b83f7fc3d2aee72903656f2
prerequisite-patch-id: dfd1784933361e11899b06d065adaa69c6a41c85
-- 
2.41.0




--- End Message ---
--- Begin Message --- Subject: Re: [bug#68084] [PATCH v2] gnu: xcb-util-renderutil: Fix cross-compiling to riscv64-linux. Date: Fri, 29 Dec 2023 18:08:57 +0100 User-agent: Gnus/5.13 (Gnus v5.13)
> * gnu/packages/xorg.scm (xcb-util-renderutil)
> [native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
> [arguments]: When target riscv64-linux-gnu, add update-config-scripts phase.

Applied, thanks,

Mathieu


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]