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

[GNU bug Tracking System]

Your message dated Tue, 14 May 2024 00:37:16 +0800
with message-id <877cfxzn0j.fsf@iscas.ac.cn>
and subject line Re: [bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation.
has caused the debbugs.gnu.org bug report #70546,
regarding [PATCH] gnu: cairo: Fix cross-compilation.
to be marked as done.

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


-- 
70546: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=70546
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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@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
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation. Date: Tue, 14 May 2024 00:37:16 +0800 User-agent: mu4e 1.12.4; emacs 30.0.50

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

signature.asc
Description: PGP signature

--- End Message ---