[bug#70546] [PATCH] gnu: cairo: Fix cross-compilation.

[bug#70546] [PATCH] gnu: cairo: Fix cross-compilation.

[Zheng Junjie]

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

* gnu/packages/gtk.scm (cairo)[arguments]: When
cross-compilation, Add fix-cross-compile phase.

Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc
---
 gnu/packages/gtk.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b0098e780e..8fcd3ed1f3 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -34,7 +34,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;;
@@ -182,7 +182,19 @@ (define cairo
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
        #:glib-or-gtk? #t
        #:configure-flags
-       (list "-Dtests=disabled")))
+       (list "-Dtests=disabled")
+       ,@(if (%current-target-system)
+             `(#:phases
+               (modify-phases %standard-phases
+                 (add-after 'unpack 'fix-cross-compile
+                   (lambda _
+                     ;; XXX: Let meson-build-system can customize the property
+                     (substitute* "meson.build"
+                       (("'ipc_rmid_deferred_release', 'auto'")
+                        ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
+                        ;; XXX: check it on hurd.
+                        "'ipc_rmid_deferred_release', 'true'"))))))
+             '())))
     (native-inputs
      `(,@(if (target-hurd?)
              '()

base-commit: d115af1bcc48f07a40dafd94d1d00926d446d068
-- 
2.41.0

[bug#70546] [PATCH] gnu: cairo: Fix cross-compilation.

[Liliana Marie Prikler]

Am Mittwoch, dem 24.04.2024 um 11:17 +0800 schrieb Zheng Junjie:
> * gnu/packages/gtk.scm (cairo)[arguments]: When
> cross-compilation, Add fix-cross-compile phase.
> 
> Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc
> ---
Haven't checked that it works yet, but at least lexically it LGTM.
For the commit message – particularly the ChangeLog portion – I'd say
"Add ‘fix-cross-compilation’ phase when cross-compiling." and adjust
the phase name accordingly.

Cheers

[bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation.

[Zheng Junjie]

* gnu/packages/gtk.scm (cairo)[arguments]: Add ‘fix-cross-compilation’ phase
when cross-compiling.

Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc
---
 gnu/packages/gtk.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b0098e780e..678bc89378 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -34,7 +34,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;;
@@ -182,7 +182,19 @@ (define cairo
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
        #:glib-or-gtk? #t
        #:configure-flags
-       (list "-Dtests=disabled")))
+       (list "-Dtests=disabled")
+       ,@(if (%current-target-system)
+             `(#:phases
+               (modify-phases %standard-phases
+                 (add-after 'unpack 'fix-cross-compilation
+                   (lambda _
+                     ;; XXX: Let meson-build-system can customize the property
+                     (substitute* "meson.build"
+                       (("'ipc_rmid_deferred_release', 'auto'")
+                        ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
+                        ;; XXX: check it on hurd.
+                        "'ipc_rmid_deferred_release', 'true'"))))))
+             '())))
     (native-inputs
      `(,@(if (target-hurd?)
              '()

base-commit: d115af1bcc48f07a40dafd94d1d00926d446d068
-- 
2.41.0

[bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation.

[Ludovic Courtès]

Hi,

Zheng Junjie <zhengjunjie@iscas.ac.cn> skribis:

> * gnu/packages/gtk.scm (cairo)[arguments]: Add ‘fix-cross-compilation’ phase
> when cross-compiling.
>
> Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc

[...]

> +       ,@(if (%current-target-system)
> +             `(#:phases
> +               (modify-phases %standard-phases
> +                 (add-after 'unpack 'fix-cross-compilation
> +                   (lambda _
> +                     ;; XXX: Let meson-build-system can customize the property

s/can customize/customize/

> +                     (substitute* "meson.build"
> +                       (("'ipc_rmid_deferred_release', 'auto'")
> +                        ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
> +                        ;; XXX: check it on hurd.
> +                        "'ipc_rmid_deferred_release', 'true'"))))))
> +             '())))

Otherwise LGTM, thanks!

Ludo’.

bug#70546: [PATCH v2] gnu: cairo: Fix cross-compilation.

[Zheng Junjie]

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

Ludovic Courtès <ludo@gnu.org> writes:

> Hi,
>
> Zheng Junjie <zhengjunjie@iscas.ac.cn> skribis:
>
>> * gnu/packages/gtk.scm (cairo)[arguments]: Add ‘fix-cross-compilation’ phase
>> when cross-compiling.
>>
>> Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc
>
> [...]
>
>> +       ,@(if (%current-target-system)
>> +             `(#:phases
>> +               (modify-phases %standard-phases
>> +                 (add-after 'unpack 'fix-cross-compilation
>> +                   (lambda _
>> +                     ;; XXX: Let meson-build-system can customize the property
>
> s/can customize/customize/
>
>> +                     (substitute* "meson.build"
>> +                       (("'ipc_rmid_deferred_release', 'auto'")
>> +                        ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
>> +                        ;; XXX: check it on hurd.
>> +                        "'ipc_rmid_deferred_release', 'true'"))))))
>> +             '())))
>
> Otherwise LGTM, thanks!
>
> Ludo’.

Thanks, push at https://git.savannah.gnu.org/cgit/guix.git/commit/?id=ecfd88cbe34551ebdae92c7c6bb5888bbd0993d6

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