[bug#61865] [PATCH 0/8] fix some packages cross-compile

[bug#61865] [PATCH 0/8] fix some packages cross-compile

[Z572 via Guix-patches via]

Hello, guix.

This patchset fix some package cross-compile.

Zheng Junjie (8):
  gnu: xcb-util-wm: fix riscv64 cross-compile.
  gnu: libxv: fix riscv64 cross-compile.
  gnu: libxtst: fix riscv64 cross-compile.
  gnu: mtdev: fix riscv64 cross-compile.
  gnu: gobject-introspection: fix riscv64 cross-compile.
  gnu: gsettings-desktop-schemas: fix cross-compile.
  gnu: libotf: fix cross-compile.
  gnu: librsvg-2.40: fix cross-compile.

 gnu/packages/fontutils.scm | 17 ++++++++++-
 gnu/packages/glib.scm      |  5 +++-
 gnu/packages/gnome.scm     |  7 +++--
 gnu/packages/xdisorg.scm   | 20 +++++++++++--
 gnu/packages/xorg.scm      | 59 ++++++++++++++++++++++++++++++++++----
 5 files changed, 95 insertions(+), 13 deletions(-)


base-commit: c0e9ddfa290056f137ee21a53be6be4fbb8586ea
-- 
2.39.1

[bug#61865] [PATCH] gnu: libxtst: fix riscv64 cross-compile.

[Z572 via Guix-patches via]

* gnu/packages/xorg.scm(libxtst): 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/xorg.scm | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 55c9b53e1d..7d5e7c6f9c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4509,13 +4509,28 @@ (define-public libxtst
             "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-static")))
+     `(#:configure-flags '("--disable-static")
+       ,@(if (target-riscv64?)
+             `(#:phases
+               (modify-phases %standard-phases
+                 (add-after 'unpack 'update-config
+                   (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"))))))
+             '())))
     (propagated-inputs
      (list libxi xorgproto))
     (inputs
-      (list libx11))
+     (list libx11))
     (native-inputs
-      (list pkg-config))
+     `(,@(if (target-riscv64?)
+             (list config)
+             '())
+       ,pkg-config))
     (home-page "https://www.x.org/wiki/")
     (synopsis "Xorg library for Xtest and Record extensions")
     (description
-- 
2.39.2

[bug#61865] [PATCH] gnu: libxtst: fix riscv64 cross-compile.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2303 bytes --]

This patch I changed (target-riscv64?) to
(and (target-riscv64?)
     (%current-target-system))

This way it only occurs when cross compiling.

On Thu, Mar 30, 2023 at 10:46:03PM +0800, Z572 via Guix-patches via wrote:
> * gnu/packages/xorg.scm(libxtst): 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/xorg.scm | 21 ++++++++++++++++++---
>  1 file changed, 18 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
> index 55c9b53e1d..7d5e7c6f9c 100644
> --- a/gnu/packages/xorg.scm
> +++ b/gnu/packages/xorg.scm
> @@ -4509,13 +4509,28 @@ (define-public libxtst
>              "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"))))
>      (build-system gnu-build-system)
>      (arguments
> -     '(#:configure-flags '("--disable-static")))
> +     `(#:configure-flags '("--disable-static")
> +       ,@(if (target-riscv64?)
> +             `(#:phases
> +               (modify-phases %standard-phases
> +                 (add-after 'unpack 'update-config
> +                   (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"))))))
> +             '())))
>      (propagated-inputs
>       (list libxi xorgproto))
>      (inputs
> -      (list libx11))
> +     (list libx11))
>      (native-inputs
> -      (list pkg-config))
> +     `(,@(if (target-riscv64?)
> +             (list config)
> +             '())
> +       ,pkg-config))
>      (home-page "https://www.x.org/wiki/")
>      (synopsis "Xorg library for Xtest and Record extensions")
>      (description
> -- 
> 2.39.2
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#61865: [PATCH 0/8] fix some packages cross-compile

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]

Thanks. I pushed most of the patches.

On Tue, Feb 28, 2023 at 04:30:45PM +0800, Z572 via Guix-patches via wrote:
> Hello, guix.
> 
> This patchset fix some package cross-compile.
> 
> Zheng Junjie (8):
>   gnu: xcb-util-wm: fix riscv64 cross-compile.
>   gnu: libxv: fix riscv64 cross-compile.
>   gnu: libxtst: fix riscv64 cross-compile.
>   gnu: mtdev: fix riscv64 cross-compile.
>   gnu: gobject-introspection: fix riscv64 cross-compile.
>   gnu: gsettings-desktop-schemas: fix cross-compile.
>   gnu: libotf: fix cross-compile.
>   gnu: librsvg-2.40: fix cross-compile.
> 
>  gnu/packages/fontutils.scm | 17 ++++++++++-
>  gnu/packages/glib.scm      |  5 +++-
>  gnu/packages/gnome.scm     |  7 +++--
>  gnu/packages/xdisorg.scm   | 20 +++++++++++--
>  gnu/packages/xorg.scm      | 59 ++++++++++++++++++++++++++++++++++----
>  5 files changed, 95 insertions(+), 13 deletions(-)
> 
> 
> base-commit: c0e9ddfa290056f137ee21a53be6be4fbb8586ea
> -- 
> 2.39.1
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]