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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 70546 in the body.
You can then email your comments to 70546 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: cairo: Fix cross-compilation.
Date: Wed, 24 Apr 2024 11:17:18 +0800

* 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 <at> cyberdimension.org>
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov <at> colimite.fr>
-;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias <at> 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

Message #8 received at 70546 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>, 70546 <at> debbugs.gnu.org
Cc: Vivien Kraus <vivien <at> planete-kraus.eu>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#70546] [PATCH] gnu: cairo: Fix cross-compilation.
Date: Wed, 24 Apr 2024 06:18:56 +0200

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

Message #11 received at 70546 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 70546 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: cairo: Fix cross-compilation.
Date: Wed, 24 Apr 2024 12:34:25 +0800

* 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 <at> cyberdimension.org>
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov <at> colimite.fr>
-;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias <at> 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

Message #14 received at 70546 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: Vivien Kraus <vivien <at> planete-kraus.eu>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, 70546 <at> debbugs.gnu.org
Subject: Re: [bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation.
Date: Mon, 13 May 2024 14:47:37 +0200

Hi,

Zheng Junjie <zhengjunjie <at> 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’.

Message #19 received at 70546-done <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 70546-done <at> debbugs.gnu.org, Vivien Kraus <vivien <at> planete-kraus.eu>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation.
Date: Tue, 14 May 2024 00:37:16 +0800

[Message part 1 (text/plain, inline)]

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

> Hi,
>
> Zheng Junjie <zhengjunjie <at> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.