[bug#70546,v2] gnu: cairo: Fix cross-compilation.
Commit Message
* 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(-)
base-commit: d115af1bcc48f07a40dafd94d1d00926d446d068
Comments
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’.
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
@@ -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?)
'()